Update linting packages and fix new issues

Author: tfranzel

drf_spectacular/plumbing.py

@@ -100,8 +100,6 @@ class Choices:  # type: ignore
 else:
     CACHED_PROPERTY_FUNCS = (cached_property,)
 
-T = TypeVar('T')
-
 
 class _Sentinel:
     pass
@@ -301,7 +299,7 @@ def build_basic_type(obj: Union[_KnownPythonTypes, OpenApiTypes]) -> Optional[_S
     elif obj in openapi_type_mapping:
         return dict(openapi_type_mapping[obj])
     elif obj in PYTHON_TYPE_MAPPING:
-        return dict(openapi_type_mapping[PYTHON_TYPE_MAPPING[obj]])
+        return dict(openapi_type_mapping[PYTHON_TYPE_MAPPING[obj]])  # type: ignore[index]
     else:
         warn(f'could not resolve type for "{obj}". defaulting to "string"')
         return dict(openapi_type_mapping[OpenApiTypes.STR])
@@ -818,6 +816,9 @@ def build(self, extra_components) -> _SchemaType:
         }
 
 
+T = TypeVar('T', bound="OpenApiGeneratorExtension")
+
+
 class OpenApiGeneratorExtension(Generic[T], metaclass=ABCMeta):
     _registry: List[Type[T]] = []
     target_class: Union[None, str, Type[object]] = None
@@ -870,7 +871,7 @@ def _matches(cls, target: Any) -> bool:
             return get_class(target) == cls.target_class
 
     @classmethod
-    def get_match(cls, target) -> Optional[T]:
+    def get_match(cls, target: Any) -> Optional[T]:
         for extension in sorted(cls._registry, key=lambda e: e.priority, reverse=True):
             if extension._matches(target):
                 return extension(target)

requirements/linting-base.txt

@@ -1,2 +1,2 @@
-Django==4.2.25
-djangorestframework==3.14.0
+Django==5.2.7
+djangorestframework==3.16.1

requirements/linting.txt

@@ -1,6 +1,6 @@
 pytest  # required for mypy to succeed
 flake8
-isort==5.12.0  # 5.13 somehow breaks django-stubs plugin
-mypy==1.7.1
-django-stubs==4.2.3
-djangorestframework-stubs==3.14.2
+isort==7.0.0
+mypy==1.18.2
+django-stubs[compatible-mypy]==5.2.7
+djangorestframework-stubs[compatible-mypy]==3.16.5

tests/contrib/test_drf_spectacular_sidecar.py

@@ -34,7 +34,7 @@ def test_sidecar_shortcut_urls_are_resolved(no_warnings):
 def test_sidecar_package_urls_matching(no_warnings):
     # poor man's test to make sure the sidecar package contents match with what
     # collectstatic is going to compile. cannot be tested directly.
-    import drf_spectacular_sidecar  # type: ignore[import-not-found]
+    import drf_spectacular_sidecar
     module_root = os.path.dirname(inspect.getfile(drf_spectacular_sidecar))
     bundle_path = os.path.join(module_root, BUNDLE_URL)
     assert os.path.isfile(bundle_path)

tests/contrib/test_pydantic.py

@@ -15,10 +15,10 @@
     class BaseModel:  # type: ignore
         pass
 
-    def dataclass(f):
+    def dataclass(f):  # type: ignore[no-redef]
         return f
 
-    def computed_field(f):
+    def computed_field(f):  # type: ignore[no-redef]
         return f
 
 
@@ -37,7 +37,7 @@ class A(BaseModel):
     b: B
     d: Decimal
 
-    @computed_field  # type: ignore[misc]
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def x(self) -> int:
         return 42
@@ -57,13 +57,13 @@ def post(self, request):
 
 @pytest.mark.contrib('pydantic')
 @pytest.mark.skipif(sys.version_info < (3, 9), reason='python 3.9+ is required by package')
-def test_pydantic_as_query_parameters(no_warnings):
+def test_pydantic_as_query_parameters(no_warnings) -> None:
     class QueryParams(BaseModel):
         foo: int
         bar: str
 
     class XAPIView(APIView):
-        @extend_schema(responses=str, parameters=[QueryParams])
+        @extend_schema(responses=str, parameters=[QueryParams])  # type: ignore[list-item]
         def get(self, request):
             pass  # pragma: no cover
 

tests/contrib/test_rest_framework_dataclasses.py

@@ -11,7 +11,7 @@
 
 @pytest.mark.contrib('rest_framework_dataclasses')
 @pytest.mark.skipif(sys.version_info < (3, 7), reason='dataclass required by package')
-def test_rest_framework_dataclasses(no_warnings):
+def test_rest_framework_dataclasses(no_warnings) -> None:
     from dataclasses import dataclass
 
     from rest_framework_dataclasses.serializers import DataclassSerializer
@@ -94,7 +94,7 @@ def custom_name_via_serializer_decoration(request):
 
 @pytest.mark.contrib('rest_framework_dataclasses')
 @pytest.mark.skipif(sys.version_info < (3, 7), reason='dataclass required by package')
-def test_rest_framework_dataclasses_class_reuse(no_warnings):
+def test_rest_framework_dataclasses_class_reuse(no_warnings) -> None:
     from dataclasses import dataclass
 
     from rest_framework_dataclasses.serializers import DataclassSerializer

tests/contrib/test_rest_framework_gis.py

@@ -3,7 +3,7 @@
 
 import pytest
 from django.db import models
-from rest_framework import __version__ as DRF_VERSION  # type: ignore[attr-defined]
+from rest_framework import __version__ as DRF_VERSION
 from rest_framework import mixins, routers, serializers, viewsets
 
 from drf_spectacular.utils import extend_schema_serializer

tests/contrib/test_simplejwt.py

@@ -14,8 +14,8 @@
         TokenObtainPairView, TokenObtainSlidingView, TokenRefreshView, TokenVerifyView,
     )
 except ImportError:
-    JWTAuthentication = None
-    JWTTokenUserAuthentication = None
+    JWTAuthentication = None  # type: ignore[misc,assignment]
+    JWTTokenUserAuthentication = None  # type: ignore[misc,assignment]
 
 
 class XSerializer(serializers.Serializer):

tests/test_examples.py

@@ -1,5 +1,5 @@
 import pytest
-from rest_framework import __version__ as DRF_VERSION  # type: ignore[attr-defined]
+from rest_framework import __version__ as DRF_VERSION
 from rest_framework import generics, pagination, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response

tests/test_fields.py

@@ -116,7 +116,7 @@ class AllFields(models.Model):
         field_json = models.JSONField()
     else:
         @property
-        def field_json(self):
+        def field_json(self):  # type: ignore[misc]
             return {'A': 1, 'B': 2}
 
     @property