fix: Fix github ci (#40)

Turns out it's already should be using github-ci, we need only minor fixes.

.github/workflows/test.yml

@@ -1,5 +1,8 @@
-# Taken from: https://jacobian.org/til/github-actions-poetry/
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
@@ -14,11 +17,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.local
-          key: poetry-1.1.9-0
+          key: poetry-1.5.1-1
 
       - uses: snok/install-poetry@v1
         with:
-          version: 1.1.9
+          version: 1.5.1
           virtualenvs-create: true
           virtualenvs-in-project: true
 
@@ -35,14 +38,6 @@ jobs:
       - run: poetry install --no-interaction --no-root
         if: steps.cache-deps.outputs.cache-hit != 'true'
 
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: "package.json"
-          cache: "yarn"
-
-      - run: yarn install --frozen-lockfile --non-interactive
-
       # Now install _your_ project. This isn't necessary for many types of projects -- particularly
       # things like Django apps don't need this. But it's a good idea since it fully-exercises the
       # pyproject.toml and makes that if you add things like console-scripts at some point that
@@ -51,4 +46,3 @@ jobs:
 
       - name: lint
         run: ./s/lint
-

pyproject.toml

@@ -19,17 +19,18 @@ packages = [
 python = "^3.7"
 typing_extensions = { version = "^4.6", python = "<3.11" }
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 ipython = "^7.19"
 django-types = "^0.3.1"
 django = "^3.1"
 flake8 = "^3.8"
 flake8-pyi = "^20.10"
-mypy = "^0.982"
+mypy = "^1.4"
 isort = "5.10.1"
 black = "^22.10.0"
 types-requests = "^2.28.11"
 ruff = "^0.0.261"
+pyright = "^1.1.318"
 
 [tool.black]
 line-length = 120
@@ -82,7 +83,7 @@ unfixable = [
     "ERA001",
 ] # we want to check ourselves before we delete commented out code.
 update-check = false
-target-version = "py311"
+target-version = "py38"
 
 [tool.ruff.flake8-tidy-imports]
 # Disallow all relative imports.

pyrightconfig.json

@@ -7,6 +7,7 @@
   "reportUntypedBaseClass": false,
   "reportMissingImports": false,
   "reportUnknownVariableType": false,
+  "reportUnusedImport": false,
   "reportInvalidTypeVarUse": false,
   "reportGeneralTypeIssues": false,
   "reportUnknownArgumentType": false,

rest_framework-stubs/decorators.pyi

@@ -90,8 +90,7 @@ _ThrottleClassesParam = Sequence[type[BaseThrottle]]
 
 def throttle_classes(throttle_classes: _ThrottleClassesParam) -> Callable[[_F], _F]: ...
 
-# probably a bug
-_PermClassesParam = Sequence[type[_PermissionClass]]  # type: ignore [misc]
+_PermClassesParam = Sequence[_PermissionClass]
 
 def permission_classes(permission_classes: _PermClassesParam) -> Callable[[_F], _F]: ...
 

rest_framework-stubs/fields.pyi

@@ -27,7 +27,6 @@ from typing import (
 
 from django.core.files.base import File
 from django.db import models
-from django.forms import ImageField as DjangoImageField  # noqa: F401
 from rest_framework.serializers import BaseSerializer
 
 class _Empty(Enum):

rest_framework-stubs/request.pyi

@@ -109,7 +109,7 @@ class Request(HttpRequest):
     def query_params(self) -> QueryDict: ...
     @property
     def data(self) -> dict[str, Any]: ...
-    @property  # type: ignore[override]
+    @property
     def user(self) -> AbstractBaseUser | AnonymousUser: ...
     @user.setter
     def user(self, value: AbstractBaseUser | AnonymousUser) -> None: ...

rest_framework-stubs/serializers.pyi

@@ -11,7 +11,6 @@ from typing import (
     Literal,
     NoReturn,
 )
-from typing_extensions import Self
 
 from django.db import models
 from django.db.models import Manager, QuerySet
@@ -73,6 +72,7 @@ from rest_framework.relations import SlugRelatedField as SlugRelatedField
 from rest_framework.relations import StringRelatedField as StringRelatedField
 from rest_framework.utils.model_meta import FieldInfo, RelationInfo
 from rest_framework.utils.serializer_helpers import BoundField, ReturnList
+from typing_extensions import Self
 
 LIST_SERIALIZER_KWARGS: Sequence[str] = ...
 ALL_FIELDS: str = ...

s/lint

@@ -11,7 +11,7 @@ else
     ./.venv/bin/ruff . --fix
 fi
 
-./node_modules/.bin/pyright tests typings
+./.venv/bin/pyright tests typings
 
 # type check code
 ./.venv/bin/mypy tests typings

tests/test_restframework.py

@@ -1,10 +1,17 @@
-from rest_framework import status
+from rest_framework.decorators import permission_classes
+from rest_framework.permissions import IsAdminUser, IsAuthenticated
 from rest_framework.test import APIClient
+from typing_extensions import assert_type
 
 
-def test_restframework_types() -> None:
+def test_test_client_types() -> None:
     client = APIClient()
+
     res = client.get("/api/v1/foo")
-    assert res.status_code == status.HTTP_200_OK
-    print(res.data)
-    assert res.json() == {"test": "foo"}
+
+    assert_type(res.status_code, int)
+
+
+def test_decorator_types() -> None:
+    permission_classes([IsAuthenticated])
+    permission_classes([IsAuthenticated | IsAdminUser])