Add py312 support

Author: kalekseev

.github/workflows/main.yml

@@ -19,33 +19,33 @@ jobs:
     strategy:
       matrix:
         # https://github.com/actions/python-versions/blob/main/versions-manifest.json
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12.0-rc.3"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
         django-version:
           - "Django>=4.2,<5.0"
-          - "Django>=5.0a1,<5.1"
+          - "Django>=5.0,<5.1"
           # - "https://github.com/django/django/archive/main.tar.gz"
         include:
           - drf: djangorestframework
-            python-version: "3.11"
+            python-version: "3.12"
             django-version: "Django<5.0,>=4.2" # must be different from django-version
         exclude:
-          - django-version: "Django>=5.0a1,<5.1"
+          - django-version: "Django>=5.0,<5.1"
             python-version: 3.8
-          - django-version: "Django>=5.0a1,<5.1"
+          - django-version: "Django>=5.0,<5.1"
             python-version: 3.9
-
+          # - django-version: "https://github.com/django/django/archive/main.tar.gz"
+          #   python-version: 3.8
+          # - django-version: "https://github.com/django/django/archive/main.tar.gz"
+          #   python-version: 3.9
+          #
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         if: "!endsWith(matrix.python-version, '-dev')"
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
           cache-dependency-path: "pyproject.toml"
-      - uses: deadsnakes/[email protected]
-        if: endsWith(matrix.python-version, '-dev')
-        with:
-          python-version: ${{ matrix.python-version }}
       - name: Install deps
         run: |
           python -m pip install -e .[test]
@@ -58,13 +58,13 @@ jobs:
     env:
       PYTHONPATH: "src"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           cache: "pip"
           cache-dependency-path: "pyproject.toml"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
@@ -75,11 +75,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           cache: "pip"
           cache-dependency-path: "pyproject.toml"
       - name: Install dependencies
@@ -88,7 +88,7 @@ jobs:
       - name: Package
         run: python -m hatch build
       - name: Upload dist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist
@@ -99,7 +99,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set release env
         id: release_output
         run: |
@@ -114,11 +114,11 @@ jobs:
           echo "::set-output name=VERSION::${VERSION}"
           echo "::set-output name=BODY::${BODY}"
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Download dist
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist

.pre-commit-config.yaml

@@ -5,12 +5,15 @@ repos:
       - id: black
         types: [python]
 
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.260
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.1
     hooks:
       - id: ruff
         language: system
         args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
+        language: system
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -28,12 +31,12 @@ repos:
       - id: mypy
         name: mypy
         language: system
-        entry: env PYTHONPATH=src mypy
+        entry: mypy
         args: [src/extra_checks, tests]
         pass_filenames: false
       - id: django-check
         name: django check
         language: system
-        entry: env PYTHONPATH=src DJANGO_SETTINGS_MODULE=tests.settings django-admin
+        entry: env PYTHONPATH=src:. DJANGO_SETTINGS_MODULE=tests.settings django-admin
         args: [check, --fail-level, CRITICAL]
         pass_filenames: false

CHANGELOG.md

@@ -2,10 +2,13 @@
 
 ### Unreleased
 
+### 0.14.0
+
 - Remove `field-boolean-null`
 - Deprecate `no-index-together`
 - Drop support for python < 3.8
 - Drop support for django < 4.2
+- Add python 3.12 to test matrix
 
 ### 0.13.3
 

pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "Collection of useful checks for Django Checks Framework"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
     { name = "Konstantin Alekseev", email = "[email protected]" },
 ]
@@ -20,27 +20,22 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.0",
-    "Framework :: Django :: 4.1",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-]
-dependencies = [
-    "typing-extensions ; python_version < \"3.8\"",
+    "Programming Language :: Python :: 3.12",
 ]
 
 [project.optional-dependencies]
 dev = [
-    "black",
     "Django",
     "django-stubs",
     "djangorestframework",
@@ -64,13 +59,14 @@ source = "vcs"
 raw-options = { local_scheme = "no-local-version" }
 
 [tool.hatch.build.targets.sdist]
-include = [
-    "/src",
-]
+include = ["/src"]
+[tool.hatch.build.targets.wheel]
+packages = ["src/extra_checks"]
 
 [tool.ruff]
 src = ["src"]
-target-version = "py37"
+target-version = "py38"
+[tool.ruff.lint]
 select = [
   'B',
   'C',
@@ -81,18 +77,21 @@ select = [
   'UP',
   'RUF',
   'INP',
-  'I'
+  'I',
+  'TCH',
 ]
 ignore = [
   'E501',
   'B904',
   'B905',
   'RUF012',
 ]
+extend-safe-fixes = ["TCH"]
 
 [tool.pytest.ini_options]
 addopts = "-p no:doctest --cov=extra_checks --cov-branch --ds=tests.settings"
 django_find_project = false
+pythonpath = "."
 
 [tool.mypy]
 plugins = ["mypy_django_plugin.main"]

shell.nix

@@ -9,18 +9,14 @@ in
 devshell.mkShell {
   name = "django-extra-checks";
   packages = [
-    nixpkgs.python311
+    nixpkgs.python312
   ];
 
   env = [
     {
       name = "PYTHONUNBUFFERED";
       value = "1";
     }
-    {
-      name = "PYTHONPATH";
-      eval = "$PWD";
-    }
     {
       name = "DJANGO_SETTINGS_MODULE";
       value = "tests.settings";

src/extra_checks/ast/ast.py

@@ -95,8 +95,11 @@ def _assignments(self) -> Dict[str, ast.Assign]:
     def field_nodes(self) -> Iterable[Tuple[models.fields.Field, "FieldAST"]]:
         for field in self.model_cls._meta.get_fields(include_parents=False):
             if isinstance(field, models.Field):
-                yield field, cast(
-                    FieldAST, SimpleLazyObject(partial(get_field_ast, self, field))
+                yield (
+                    field,
+                    cast(
+                        FieldAST, SimpleLazyObject(partial(get_field_ast, self, field))
+                    ),
                 )
 
     def has_meta_var(self, name: str) -> bool:

src/extra_checks/ast/protocols.py

@@ -1,10 +1,4 @@
-import sys
-from typing import Any, Iterable, Optional, Tuple
-
-if sys.version_info >= (3, 8):
-    from typing import Protocol
-else:
-    from typing_extensions import Protocol
+from typing import Any, Iterable, Optional, Protocol, Tuple
 
 from django.db import models
 

src/extra_checks/checks/drf_serializer_checks.py

@@ -99,7 +99,7 @@ def _get_serializers_to_check(
 ) -> Tuple[Iterator[Type[Serializer]], Iterator[Type[ModelSerializer]]]:
     serializer_classes = _filter_app_serializers(
         collect_subclasses(
-            s for s in Serializer.__subclasses__() if s is not ModelSerializer  # type: ignore
+            s for s in Serializer.__subclasses__() if s is not ModelSerializer
         ),
         include_apps,
     )

src/extra_checks/forms.py

@@ -167,7 +167,9 @@ def clean(self) -> typing.Dict[str, typing.Any]:
             del self.cleaned_data["level"]
         return self.cleaned_data
 
-    def is_valid(self, check_forms: typing.Dict[CheckId, "typing.Type[BaseCheckForm]"]) -> bool:  # type: ignore
+    def is_valid(  # type: ignore
+        self, check_forms: typing.Dict[CheckId, "typing.Type[BaseCheckForm]"]
+    ) -> bool:
         if not super().is_valid():
             return False
         checks = self.cleaned_data.get("checks", {})

src/extra_checks/registry.py

@@ -59,7 +59,7 @@ def create(
 
     @staticmethod
     def _build_ignored(
-        ignore_checks: Dict[Any, Set[Union[str, CheckId]]]
+        ignore_checks: Dict[Any, Set[Union[str, CheckId]]],
     ) -> Tuple[Dict[CheckId, Set[Any]], List[str]]:
         errors = []
         ignored: Dict[CheckId, set] = {}