Add django-stubs v1.10.0 compatibility

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9']
     steps:
       - uses: actions/checkout@v2
       - name: Setup system dependencies
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9']
     steps:
       - uses: actions/checkout@v2
       - name: Setup system dependencies

mypy_drf_plugin/main.py

@@ -3,7 +3,7 @@
 from mypy.nodes import TypeInfo
 from mypy.options import Options
 from mypy.plugin import ClassDefContext, Plugin
-from mypy_django_plugin import main as mypy_django_main
+from mypy_django_plugin.config import DjangoPluginConfig
 from mypy_django_plugin.django.context import DjangoContext
 
 from mypy_drf_plugin.lib import fullnames, helpers
@@ -22,7 +22,7 @@ class NewSemanalDRFPlugin(Plugin):
     def __init__(self, options: Options) -> None:
         super().__init__(options)
 
-        django_settings_module = mypy_django_main.extract_django_settings_module(options.config_file)
+        django_settings_module = DjangoPluginConfig(options.config_file).django_settings_module
         self.django_context = DjangoContext(django_settings_module)
 
     def _get_currently_defined_serializers(self) -> Dict[str, int]:

requirements.txt

@@ -1,6 +1,6 @@
 wheel
 gitpython==3.1.9
-pre-commit==2.7.1
+pre-commit==2.9.2
 pytest==6.1.1
 pytest-mypy-plugins==1.9.1
 djangorestframework==3.12.1

rest_framework-stubs/test.pyi

@@ -12,12 +12,13 @@ from django.test.client import RequestFactory as DjangoRequestFactory
 from rest_framework.authtoken.models import Token
 from rest_framework.request import Request
 from rest_framework.response import Response
+import urllib3
 
 def force_authenticate(
     request: HttpRequest, user: Optional[Union[AnonymousUser, AbstractBaseUser]] = ..., token: Optional[Token] = ...
 ) -> None: ...
 
-class HeaderDict(requests.packages.urllib3._collections.HTTPHeaderDict):
+class HeaderDict(urllib3._collections.HTTPHeaderDict):
     def get_all(self, key: Any, default: Any): ...
 
 class MockOriginalResponse:

setup.py

@@ -21,7 +21,7 @@ def find_stub_files(name):
 
 dependencies = [
     "mypy>=0.790",
-    "django-stubs>=1.7.0",
+    "django-stubs>=1.10.0",
     "typing-extensions>=3.7.2",
     "requests>=2.0.0",
     "coreapi>=2.0.0",
@@ -43,11 +43,10 @@ def find_stub_files(name):
     install_requires=dependencies,
     packages=["rest_framework-stubs", *find_packages(exclude=["scripts"])],
     package_data={"rest_framework-stubs": find_stub_files("rest_framework-stubs")},
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     classifiers=[
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

tests/typecheck/test_serializers.yml

@@ -15,7 +15,7 @@
     from rest_framework import serializers
 
     reveal_type(serializers.ModelSerializer.Meta.model) # N: Revealed type is "Type[_MT?]"
-    reveal_type(serializers.ModelSerializer.Meta.fields) # N: Revealed type is "typing.Sequence[builtins.str]"
+    reveal_type(serializers.ModelSerializer.Meta.fields) # N: Revealed type is "Union[typing.Sequence[builtins.str], Literal['__all__']]"
     reveal_type(serializers.ModelSerializer.Meta.read_only_fields) # N: Revealed type is "Union[typing.Sequence[builtins.str], None]"
     reveal_type(serializers.ModelSerializer.Meta.exclude) # N: Revealed type is "Union[typing.Sequence[builtins.str], None]"
     reveal_type(serializers.ModelSerializer.Meta.depth) # N: Revealed type is "Union[builtins.int, None]"