drop python 3.8

Author: kalekseev

.github/workflows/main.yml

@@ -19,24 +19,23 @@ 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", "3.13"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
         django-version:
           - "Django>=4.2,<5.0"
           - "Django>=5.0,<5.1"
           - "Django>=5.1,<5.2"
+          - "Django==5.2a1"
           # - "https://github.com/django/django/archive/main.tar.gz"
         include:
           - drf: djangorestframework
             python-version: "3.12"
             django-version: "Django<5.2,>=5.0" # must be different from django-version
         exclude:
-          - django-version: "Django>=5.0,<5.1"
-            python-version: 3.8
           - django-version: "Django>=5.0,<5.1"
             python-version: 3.9
           - django-version: "Django>=5.1,<5.2"
-            python-version: 3.8
-          - django-version: "Django>=5.1,<5.2"
+            python-version: 3.9
+          - django-version: "Django==5.2a1"
             python-version: 3.9
           # - django-version: "https://github.com/django/django/archive/main.tar.gz"
           #   python-version: 3.8

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ### Unreleased
 
+- drop python 3.8 support
+- add django 5.2 to test matrix
+
 ### 0.16.1
 
 - fix `field-choices-constraint`

README.md

@@ -126,7 +126,7 @@ EXTRA_CHECKS = {
 
 ## Development
 
-Install dev deps in virtualenv `pip install -e .[dev,test]`.
+Install dev deps in virtualenv `uv sync --group test`.
 
 ## Credits
 

conftest.py

@@ -35,9 +35,9 @@ def handler(self, handler):
     def run(self):
         self._registry.enabled_checks = {}
         handlers = self._registry.bind()
-        assert (
-            self._registry.is_healthy
-        ), f"Settings has errors: {self._registry._config.errors.as_text()}"
+        assert self._registry.is_healthy, (
+            f"Settings has errors: {self._registry._config.errors.as_text()}"
+        )
         return list(handlers[self.TEST_TAG]())
 
     def models(self, *models):

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.8"
+requires-python = ">=3.9"
 authors = [
     { name = "Konstantin Alekseev", email = "[email protected]" },
 ]
@@ -23,20 +23,20 @@ classifiers = [
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.1",
+    "Framework :: Django :: 5.2",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
     "Django",
     "django-stubs",
@@ -67,7 +67,7 @@ packages = ["src/extra_checks"]
 
 [tool.ruff]
 src = ["src"]
-target-version = "py38"
+target-version = "py39"
 [tool.ruff.lint]
 select = [
   'B',

src/extra_checks/ast/__init__.py

@@ -1,4 +1,4 @@
-from typing import Container, Type
+from collections.abc import Container
 
 from django.db import models
 
@@ -14,7 +14,7 @@
 
 
 def get_model_ast(
-    model_cls: Type[models.Model],
+    model_cls: type[models.Model],
     meta_checks: Container[CheckId],
 ) -> ModelASTDisableCommentProtocol:
     return ModelAST(model_cls, meta_checks)

src/extra_checks/ast/ast.py

@@ -1,16 +1,10 @@
 import ast
+from collections.abc import Container, Iterable, Iterator
 from functools import partial
 from typing import (
     TYPE_CHECKING,
     Callable,
-    Container,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
     Optional,
-    Tuple,
-    Type,
     Union,
     cast,
 )
@@ -36,10 +30,10 @@
 
 
 class ModelAST(DisableCommentProtocol, ModelASTProtocol):
-    def __init__(self, model_cls: Type[models.Model], meta_checks: Container[CheckId]):
+    def __init__(self, model_cls: type[models.Model], meta_checks: Container[CheckId]):
         self.model_cls = model_cls
         self.meta_checks = meta_checks
-        self._assignment_nodes: List[ast.Assign] = []
+        self._assignment_nodes: list[ast.Assign] = []
         self._meta: Optional[ast.ClassDef] = None
 
     @cached_property
@@ -73,8 +67,8 @@ def _meta_node(self) -> Optional[ast.ClassDef]:
         return self._meta
 
     @cached_property
-    def _meta_vars(self) -> Dict[str, ast.Assign]:
-        data: Dict[str, ast.Assign] = {}
+    def _meta_vars(self) -> dict[str, ast.Assign]:
+        data: dict[str, ast.Assign] = {}
         if not self._meta_node:
             return data
         for node in ast.iter_child_nodes(self._meta_node):
@@ -83,7 +77,7 @@ def _meta_vars(self) -> Dict[str, ast.Assign]:
         return data
 
     @cached_property
-    def _assignments(self) -> Dict[str, ast.Assign]:
+    def _assignments(self) -> dict[str, ast.Assign]:
         self._parse()
         result = {}
         for node in self._assignment_nodes:
@@ -92,7 +86,7 @@ def _assignments(self) -> Dict[str, ast.Assign]:
         return result
 
     @cached_property
-    def field_nodes(self) -> Iterable[Tuple[models.fields.Field, "FieldAST"]]:
+    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 (
@@ -155,11 +149,11 @@ def __init__(
         self._source_provider = source_provider
 
     @cached_property
-    def _args(self) -> List[ast.expr]:
+    def _args(self) -> list[ast.expr]:
         return self._node.value.args  # type: ignore
 
     @cached_property
-    def _kwargs(self) -> Dict[str, ast.keyword]:
+    def _kwargs(self) -> dict[str, ast.keyword]:
         return {kw.arg: kw for kw in self._node.value.keywords if kw.arg}  # type: ignore
 
     def get_arg(self, name: str) -> Optional[ArgASTProtocol]:

src/extra_checks/ast/protocols.py

@@ -1,4 +1,5 @@
-from typing import Any, Iterable, Optional, Protocol, Tuple
+from collections.abc import Iterable
+from typing import Any, Optional, Protocol
 
 from django.db import models
 
@@ -21,7 +22,7 @@ class ModelASTProtocol(Protocol):
     @property
     def field_nodes(
         self,
-    ) -> Iterable[Tuple[models.fields.Field, "FieldASTDisableCommentProtocol"]]: ...
+    ) -> Iterable[tuple[models.fields.Field, "FieldASTDisableCommentProtocol"]]: ...
 
     def has_meta_var(self, name: str) -> bool: ...
 

src/extra_checks/ast/source_provider.py

@@ -1,7 +1,8 @@
 import inspect
 import re
 import textwrap
-from typing import TYPE_CHECKING, Dict, Iterable, Optional, Set, Type
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, Optional
 
 from extra_checks.check_id import ALL_CHECKS_NAMES, CheckId
 
@@ -14,7 +15,7 @@
 DISABLE_COMMENT_PATTERN = r"^#\s*extra-checks-disable-next-line(?:\s+(.*))?$"
 
 
-def _parse_comment(checks: Optional[str]) -> Set[str]:
+def _parse_comment(checks: Optional[str]) -> set[str]:
     if not checks:
         return ALL_CHECKS_NAMES  # type: ignore
     result = set()
@@ -25,7 +26,7 @@ def _parse_comment(checks: Optional[str]) -> Set[str]:
     return result
 
 
-def _find_disabled_checks(comments: Iterable[str]) -> Set[str]:
+def _find_disabled_checks(comments: Iterable[str]) -> set[str]:
     result = set()
     for line in comments:
         m = re.match(DISABLE_COMMENT_PATTERN, line)
@@ -35,9 +36,9 @@ def _find_disabled_checks(comments: Iterable[str]) -> Set[str]:
 
 
 class SourceProvider:
-    def __init__(self, obj: Type) -> None:
+    def __init__(self, obj: type) -> None:
         self._obj = obj
-        self._comments_cache: Dict[int, Set[str]] = {}
+        self._comments_cache: dict[int, set[str]] = {}
 
     @cached_property
     def source(self) -> Optional[str]:
@@ -63,7 +64,7 @@ def _get_line_comments(self, line_no: int) -> Iterable[str]:
             else:
                 break
 
-    def get_disabled_checks_for_line(self, line_no: int) -> Set[str]:
+    def get_disabled_checks_for_line(self, line_no: int) -> set[str]:
         if line_no not in self._comments_cache:
             comments = self._get_line_comments(line_no)
             self._comments_cache[line_no] = _find_disabled_checks(comments)

src/extra_checks/checks/base_checks.py

@@ -1,15 +1,12 @@
 import warnings
 from abc import ABC, abstractmethod
+from collections.abc import Iterator
 from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
     ClassVar,
-    Iterator,
-    List,
     Optional,
-    Set,
-    Type,
 )
 
 import django.core.checks
@@ -28,14 +25,14 @@
 
 class BaseCheck(ABC):
     Id: CheckId
-    settings_form_class: ClassVar[Type[forms.BaseCheckForm]] = forms.BaseCheckForm
+    settings_form_class: ClassVar[type[forms.BaseCheckForm]] = forms.BaseCheckForm
     level = django.core.checks.WARNING
-    deprecation_warnings: List[str] = []
+    deprecation_warnings: list[str] = []
 
     def __init__(
         self,
         level: Optional[int] = None,
-        ignore_objects: Optional[Set[Any]] = None,
+        ignore_objects: Optional[set[Any]] = None,
         ignore_types: Optional[set] = None,
         skipif: Optional[Callable] = None,
     ) -> None: