Merge pull request #6 from i-dot-ai/EN-627/3_12_upgrade

Upgrade to python 3.12

.github/workflows/pypi_publish.yml

@@ -11,20 +11,20 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.12"
           cache: "poetry"
 
       - name: Install dependencies
         run: |
-          poetry env use "3.7"
+          poetry env use "3.12"
           poetry install
 
       - name: Bump version number

.github/workflows/run_tests.yml

@@ -7,17 +7,17 @@ jobs:
       fail-fast: false
       matrix:
         os: ["macos-latest"]
-        python-version: ["3.11"]
+        python-version: ["3.12"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "poetry"
@@ -30,7 +30,3 @@ jobs:
       - name: Run Checks
         run: |
           bash scripts/test.sh --ci
-
-      - name: Upload coverage to Codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9'
-        uses: codecov/codecov-action@v2

cruft/__init__.py

@@ -3,6 +3,7 @@
 Allows you to maintain all the necessary cruft for packaging and building projects separate from
 the code you intentionally write. Built on-top of, and fully compatible with, CookieCutter.
 """
+
 from cruft._commands import check, create, diff, link, update
 from cruft._version import __version__
 

cruft/_cli.py

@@ -1,4 +1,5 @@
 """This module defines CLI interactions when using `cruft`."""
+
 import json
 from pathlib import Path
 from typing import List, Optional

cruft/_commands/__init__.py

@@ -1,4 +1,5 @@
 """Contains the core logic behind all cruft commands."""
+
 from .check import check
 from .create import create
 from .diff import diff

cruft/exceptions.py

@@ -1,4 +1,5 @@
 """Contains all custom exceptions raised by cruft."""
+
 from pathlib import Path
 from typing import Union
 

pyproject.toml

@@ -8,14 +8,15 @@ readme = "README.md"
 packages = [{ include = "cruft" }]
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = ">=3.12"
 cookiecutter = ">=1.7"
 gitpython = ">=3.0"
 toml = { version = ">=0.10", optional = true, python = "<3.11" }
 typer = ">=0.4.0"
 click = ">= 7.1.2"
 #examples = {version = ">=1.0.2", optional = true}
 importlib-metadata = {version = ">=2.0.0,<5.0.0", python = "<3.8"}
+flake8 = "^7.1.1"
 
 [tool.poetry.extras]
 pyproject = ["toml"]
@@ -27,7 +28,7 @@ black = ">=22.12.0"
 examples = { version = ">=1.0.2", python = ">=3.7.0,<4.0"}
 safety = ">=1.8"
 isort = ">=5.11.0"
-flake8 = "<5.0.0,>=4.0.0"
+flake8 = "<8.0.0,>=7.0.0"
 flake8-bugbear = ">=19.8"
 mypy = ">=0.971"
 types-toml = ">=0.10"

setup.cfg

@@ -1,5 +1,6 @@
 [flake8]
 max-line-length = 100
 extend-ignore =
-    E203  # https://github.com/psf/black/blob/master/docs/the_black_code_style.md#slices
-    B008
+    # https://github.com/psf/black/blob/master/docs/the_black_code_style.md#slices
+    E203,
+    B008,

tests/test_api.py

@@ -245,7 +245,7 @@ def test_diff_has_diff(
 @@ -1 +1 @@
 -new content 0
 +content0
-"""
+"""  # noqa: E501
     expected_output_regex = re.escape(expected_output)
     expected_output_regex = expected_output_regex.replace(r"\{tmpdir\}", r"([^\n]*)")
     expected_output_regex = rf"^{expected_output_regex}$"

tests/test_utils.py

@@ -102,7 +102,7 @@ def test_remove_paths_with_glob_pattern_and_string(tmp_path: Path):
     (repo0 / "tests" / "test0.py").touch()
     (repo0 / "tests" / "test1.py").touch()
 
-    with pytest.warns(None) as warn_record:
+    with pytest.warns() as warn_record:
         utils.generate._remove_paths(repo0, {5})  # type: ignore
     assert len(warn_record) != 0, "a warning should have been called as typing was off"
     assert (repo0 / "tests" / "test0.py").exists()