Fix errors in CI (typeddjango#273)

mvandenburgh · Nov 7, 2022 · ec5ecd4 · ec5ecd4
1 parent e46f90e
commit ec5ecd4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,3 +7,6 @@ line_length = 120
 multi_line_output = 3
 include_trailing_comma = true
 profile = 'black'
+
+[build-system]
+requires = ["setuptools<64", "wheel"]
diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,6 @@ pytest==7.1.2
 pytest-mypy-plugins==1.9.3
 djangorestframework==3.13.1
 types-pytz==2022.1.2
+django-stubs==1.12.0
+django-stubs-ext==0.5.0
 -e .[compatible-mypy,coreapi,markdown]
diff --git a/rest_framework-stubs/decorators.pyi b/rest_framework-stubs/decorators.pyi
@@ -48,13 +48,15 @@ _MIXED_CASE_HTTP_VERBS = List[
         "PUT",
         "PATCH",
         "TRACE",
+        "HEAD",
         "OPTIONS",
         "get",
         "post",
         "delete",
         "put",
         "patch",
         "trace",
+        "head",
         "options",
     ]
 ]

diff --git a/rest_framework-stubs/permissions.pyi b/rest_framework-stubs/permissions.pyi
@@ -43,8 +43,8 @@ class OR(_SupportsHasPermission):
 class NOT(_SupportsHasPermission):
     def __init__(self, op1: _SupportsHasPermission) -> None: ...
 
-class BasePermissionMetaclass(OperationHolderMixin, type): ...
-class BasePermission(_SupportsHasPermission, metaclass=BasePermissionMetaclass): ...
+class BasePermissionMetaclass(OperationHolderMixin, type): ...  # type: ignore[misc]
+class BasePermission(_SupportsHasPermission, metaclass=BasePermissionMetaclass): ...  # type: ignore[misc]
 class AllowAny(BasePermission): ...
 class IsAuthenticated(BasePermission): ...
 class IsAdminUser(BasePermission): ...

diff --git a/scripts/typecheck_tests.py b/scripts/typecheck_tests.py
@@ -157,6 +157,8 @@
         '"ResolverMatch" has incompatible type "str"; expected "Callable[..., Any]"',
         "_SupportsHasPermission",
         "Invalid type alias: expression is not a valid type",
+        '"object" not callable',
+        'Cannot assign multiple types to name "composed_perm" without an explicit "Type[...]" annotation',
     ],
     "test_relations.py": [
         'Invalid index type "int" for "Union[str, List[Any], Dict[str, Any]]"; expected type "str"',