Merge branch 'master' into fix-cleanup-serializer-typevars

Author: intgr

.github/workflows/test.yml

@@ -7,11 +7,19 @@ on:
   pull_request:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   mypy-self-check:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:

.pre-commit-config.yaml

@@ -13,12 +13,12 @@ repos:
       - id: check-merge-conflict
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.3.3
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 24.3.0
     hooks:
       - id: black
 

pyproject.toml

@@ -1,6 +1,7 @@
 [tool.black]
 line-length = 120
 include = '\.pyi?$'
+target-version = ["py38", "py39", "py310", "py311", "py312"]
 
 [tool.ruff]
 # Adds to default excludes: https://docs.astral.sh/ruff/settings/#exclude
@@ -39,10 +40,9 @@ ignore = ["PYI021", "PYI024", "PYI041", "PYI043"]
     "F405",
     "F822",
     "F821",
-    "PYI026",  # TODO fix these errors
     "PGH003",  # TODO fix these errors
-    "PYI002",  # TODO fix these errors
 ]
+"rest_framework-stubs/compat.pyi" = ["PYI042"]
 
 [tool.ruff.flake8-tidy-imports.banned-api]
 "_typeshed.Self".msg = "Use typing_extensions.Self (PEP 673) instead."

requirements.txt

@@ -1,10 +1,11 @@
 wheel
-pre-commit==3.5.0
-pytest==7.4.3
-pytest-mypy-plugins==3.0.0
-djangorestframework==3.14.0
-types-pytz==2023.3.1.1
-types-requests==2.31.0.10
+pre-commit==3.5.0; python_version < '3.9'
+pre-commit==3.6.2; python_version >= '3.9'
+pytest==8.1.1
+pytest-mypy-plugins==3.1.1
+djangorestframework==3.15.0
+types-pytz==2024.1.0.20240203
+types-requests==2.31.0.20240311
 types-urllib3==1.26.25.14
 django-stubs[compatible-mypy] @ git+https://github.com/typeddjango/django-stubs
 django-stubs-ext @ git+https://github.com/typeddjango/django-stubs#subdirectory=ext

rest_framework-stubs/compat.pyi

@@ -1,51 +1,51 @@
 from typing import Any
 
 from django.db.models import QuerySet
+from typing_extensions import TypeAlias
 
 try:
     from django.contrib.postgres import fields as postgres_fields
 except ImportError:
-    postgres_fields = None  # type: ignore
+    postgres_fields: TypeAlias = None  # type: ignore[no-redef]
 try:
     import coreapi
 except ImportError:
-    coreapi = None
+    coreapi: TypeAlias = None  # type: ignore[no-redef]
 try:
     import uritemplate
 except ImportError:
-    uritemplate = None  # type: ignore
+    uritemplate: TypeAlias = None  # type: ignore[no-redef]
 try:
     import coreschema
 except ImportError:
-    coreschema = None
+    coreschema: TypeAlias = None  # type: ignore[no-redef]
 try:
     import yaml
 except ImportError:
-    yaml = None  # type: ignore
+    yaml: TypeAlias = None  # type: ignore[no-redef]
 try:
     import requests
 except ImportError:
-    requests = None  # type: ignore
+    requests: TypeAlias = None  # type: ignore[no-redef]
 try:
     import pygments
 except ImportError:
-    pygments = None
+    pygments: TypeAlias = None  # type: ignore[no-redef]
+
 try:
     import markdown
-    def apply_markdown(text: str) -> str: ...
-
-except ImportError:
-    apply_markdown = None  # type: ignore
-    markdown = None  # type: ignore
-
-if markdown is not None and pygments is not None:
     from markdown.preprocessors import Preprocessor
+    def apply_markdown(text: str) -> str: ...
 
     class CodeBlockPreprocessor(Preprocessor):
         pattern: Any
         formatter: Any
         def run(self, lines: list[str]) -> list[str]: ...
 
+except ImportError:
+    apply_markdown: TypeAlias = None  # type: ignore[no-redef]
+    markdown: TypeAlias = None  # type: ignore[no-redef]
+
 def pygments_css(style: Any) -> str | None: ...
 def pygments_highlight(text: str, lang: str, style: Any) -> Any: ...
 def md_filter_add_syntax_highlight(md: Any) -> bool: ...

rest_framework-stubs/exceptions.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Mapping, Sequence
-from typing import Any
+from typing import Any, ClassVar
 
 from django.http import HttpRequest, JsonResponse
 from django_stubs_ext import StrOrPromise
@@ -43,6 +43,10 @@ class APIException(Exception):
 class ValidationError(APIException):
     # ValidationError wraps `detail` in a list if it's not already a list/dict.
     detail: list[_Detail] | dict[str, _Detail]
+    default_params: ClassVar[Mapping[str, Any]]
+    def __init__(
+        self, detail: _Detail | None = ..., code: str | None = ..., params: Mapping[str, Any] | None = ...
+    ) -> None: ...
 
 class ParseError(APIException): ...
 class AuthenticationFailed(APIException): ...

rest_framework-stubs/fields.pyi

@@ -181,7 +181,7 @@ class EmailField(CharField): ...
 class RegexField(CharField):
     def __init__(
         self,
-        regex: str | Pattern,
+        regex: str | Pattern[str],
         *,
         read_only: bool = ...,
         write_only: bool = ...,

rest_framework-stubs/renderers.pyi

@@ -65,7 +65,7 @@ class BrowsableAPIRenderer(BaseRenderer):
         view_instance: APIView,
         request: Request,
         *args: Incomplete,
-        **kwargs: Incomplete
+        **kwargs: Incomplete,
     ) -> BaseSerializer: ...
     def get_rendered_html_form(self, data: Any, view: APIView, method: str, request: Request) -> Any: ...
     def render_form_for_serializer(self, serializer: BaseSerializer) -> Any: ...

rest_framework-stubs/reverse.pyi

@@ -10,15 +10,15 @@ def reverse(
     kwargs: Mapping[str, Any] | None = ...,
     request: HttpRequest | None = ...,
     format: str | None = ...,
-    **extra: Any
+    **extra: Any,
 ) -> str: ...
 def _reverse(
     viewname: str,
     args: Sequence[Any] | None = ...,
     kwargs: Mapping[str, Any] | None = ...,
     request: HttpRequest | None = ...,
     format: str | None = ...,
-    **extra: Any
+    **extra: Any,
 ) -> str: ...
 
 reverse_lazy: Callable[..., str]

rest_framework-stubs/routers.pyi

@@ -43,7 +43,7 @@ class BaseRouter(metaclass=RenameRouterMethods):
 class SimpleRouter(BaseRouter):
     routes: list[Route | DynamicRoute]
     trailing_slash: str
-    def __init__(self, trailing_slash: bool = ...) -> None: ...
+    def __init__(self, trailing_slash: bool = ..., use_regex_path: bool = ...) -> None: ...
     def get_routes(self, viewset: type[ViewSetMixin]) -> list[Route]: ...
     def _get_dynamic_route(self, route: DynamicRoute, action: Any) -> Route: ...
     def get_method_map(self, viewset: type[ViewSetMixin], method_map: Mapping[str, str]) -> dict[str, str]: ...