Update type hints (#122)

requirements.txt

@@ -5,8 +5,6 @@ django[argon2,bcrypt]==3.0.*
 djangorestframework==3.10.*
 dj-database-url
 django-dotenv
-django-stubs
-djangorestframework-stubs
 
 # PostgreSQL testing.
 psycopg2-binary

scripts/check

@@ -2,14 +2,12 @@
 
 . scripts/env
 
-export TYPED_SOURCE_FILES="src/rest_framework_api_key tests/conftest.py"
-export SOURCE_FILES="$TYPED_SOURCE_FILES test_project/"
+export SOURCE_FILES="src/rest_framework_api_key test_project/ tests/conftest.py"
 
 set -x
 
 ${PREFIX}black --check --diff --target-version=py36 $SOURCE_FILES
 ${PREFIX}flake8 $SOURCE_FILES
-${PREFIX}mypy $TYPED_SOURCE_FILES
+${PREFIX}mypy $SOURCE_FILES
 ${PREFIX}isort --check --diff --project=djangorestframework-api-key --recursive $SOURCE_FILES
-
-scripts/makemigrations --check
+${PREFIX}python scripts/makemigrations --check

setup.cfg

@@ -5,10 +5,6 @@ max-line-length = 88
 [mypy]
 disallow_untyped_defs = True
 ignore_missing_imports = True
-plugins = mypy_django_plugin.main, mypy_drf_plugin.main
-
-[mypy.plugins.django-stubs]
-django_settings_module = test_project.project.settings
 
 [tool:isort]
 combine_as_imports = True

src/rest_framework_api_key/admin.py

@@ -9,6 +9,7 @@
 
 class APIKeyModelAdmin(admin.ModelAdmin):
     model: typing.Type[AbstractAPIKey]
+
     list_display = (
         "prefix",
         "name",

src/rest_framework_api_key/migrations/0001_initial.py

@@ -7,6 +7,8 @@ class Migration(migrations.Migration):
 
     initial = True
 
+    dependencies = []  # type: ignore
+
     operations = [
         migrations.CreateModel(
             name="APIKey",

src/rest_framework_api_key/migrations/0004_prefix_hashed_key.py

@@ -1,17 +1,13 @@
 # Generated by Django 2.2.2 on 2019-06-29 10:38
 
-from django.apps.registry import Apps
 from django.db import migrations, models
-from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 
 APP_NAME = "rest_framework_api_key"
 MODEL_NAME = "apikey"
 DEPENDENCIES = [(APP_NAME, "0003_auto_20190623_1952")]
 
 
-def populate_prefix_hashed_key(
-    apps: Apps, schema_editor: BaseDatabaseSchemaEditor
-) -> None:
+def populate_prefix_hashed_key(apps, schema_editor) -> None:  # type: ignore
     model = apps.get_model(APP_NAME, MODEL_NAME)
 
     for api_key in model.objects.all():

src/rest_framework_api_key/permissions.py

@@ -34,7 +34,7 @@ def get_from_header(self, request: HttpRequest, name: str) -> typing.Optional[st
 
 
 class BaseHasAPIKey(permissions.BasePermission):
-    model: typing.Optional[typing.Type[APIKey]] = None
+    model: typing.Optional[typing.Type[AbstractAPIKey]] = None
     key_parser = KeyParser()
 
     def get_key(self, request: HttpRequest) -> typing.Optional[str]:

test_project/heroes/migrations/0002_prefix_hashed_key.py

@@ -7,7 +7,7 @@
 DEPENDENCIES = [(APP_NAME, "0001_initial")]
 
 
-def populate_prefix_hashed_key(apps, schema_editor):
+def populate_prefix_hashed_key(apps, schema_editor):  # type: ignore
     model = apps.get_model(APP_NAME, MODEL_NAME)
 
     for api_key in model.objects.all():

test_project/heroes/models.py

@@ -11,12 +11,12 @@ class Hero(models.Model):
     class Meta:
         verbose_name_plural = "heroes"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
 
 class HeroAPIKeyManager(BaseAPIKeyManager):
-    def get_usable_keys(self):
+    def get_usable_keys(self) -> models.QuerySet:
         return super().get_usable_keys().filter(hero__retired=False)