Merge pull request #44 from eadwinCode/ninja_0_20_upgrade

Ninja 0.20.0 upgrade

Author: eadwinCode

.github/workflows/test_full.yml

@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-        django-version: ['<2.1', '<2.2', '<3.0', '<3.1', '<3.2', '<3.3', '<4.1']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        django-version: ['<3.0', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2']
 
     steps:
       - uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -14,14 +14,14 @@ repos:
       name: Code Formatting
       entry: "make fmt"
       types: [python]
-      language_version: python3.6
+      language_version: python3.8
       language: python
     - id: code_linting
       args: [ ]
       name: Code Linting
       entry: "make lint"
       types: [ python ]
-      language_version: python3.6
+      language_version: python3.8
       language: python
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v2.3.0

ninja_extra/__init__.py

@@ -1,6 +1,6 @@
 """Django Ninja Extra - Class Based Utility and more for Django Ninja(Fast Django REST framework)"""
 
-__version__ = "0.16.0"
+__version__ = "0.18.0"
 
 import django
 

pyproject.toml

@@ -27,6 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Framework :: Django",
     "Framework :: Django :: 2.1",

tests/test_route.py

@@ -16,7 +16,10 @@
     RouteInvalidParameterException,
 )
 from ninja_extra.controllers.base import get_all_controller_route_function
-from ninja_extra.controllers.route.context import RouteContext
+from ninja_extra.controllers.route.context import (
+    RouteContext,
+    get_route_execution_context,
+)
 from ninja_extra.exceptions import PermissionDenied
 from ninja_extra.permissions import AllowAny
 
@@ -352,7 +355,7 @@ def test_route_is_protected_by_its_permissions_paramater(self):
 
     def test_route_prep_controller_route_execution_context_works(self):
         route_function: RouteFunction = SomeTestController.example
-        context = route_function.get_route_execution_context(request=anonymous_request)
+        context = get_route_execution_context(request=anonymous_request)
         with route_function._prep_controller_route_execution(context=context) as ctx:
             assert isinstance(ctx.controller_instance, SomeTestController)
             assert ctx.controller_instance.context
@@ -362,7 +365,7 @@ def test_route_prep_controller_route_execution_context_cleans_controller_after_r
         self,
     ):
         route_function: RouteFunction = SomeTestController.example
-        context = route_function.get_route_execution_context(request=anonymous_request)
+        context = get_route_execution_context(request=anonymous_request)
         with pytest.raises(Exception):
             with route_function._prep_controller_route_execution(
                 context=context

tests/test_testclient.py

@@ -28,10 +28,10 @@ def test_add_works(self):
 
 
 @pytest.mark.skipif(django.VERSION < (3, 1), reason="requires django 3.1 or higher")
-@pytest.mark.asyncio
 class TestTestAsyncClient:
     if not django.VERSION < (3, 1):
 
+        @pytest.mark.asyncio
         async def test_add_async_works(self):
             client = TestAsyncClient(router)
             res = await client.get("/add-async", query=dict(a=4, b=6))

tests/test_throthling/test_decorator.py

@@ -53,7 +53,7 @@ def dynamic_throttling_scope(request):
 
 
 class TestThrottling:
-    def setup(self):
+    def setup_method(self):
         self.user = ThrottlingMockUser("Ninja")
         self.user.set_id(uuid.uuid4())
 

tests/test_throthling/test_models.py

@@ -15,7 +15,7 @@
 
 @pytest.mark.django_db
 class TestAnonRateThrottle:
-    def setup(self):
+    def setup_method(self):
         self.throttle = AnonRateThrottle()
         self.request = HttpRequest()
         self.request.user = None
@@ -31,7 +31,7 @@ def test_get_cache_key_returns_correct_value(self):
 
 
 class TestBaseThrottle:
-    def setup(self):
+    def setup_method(self):
         self.throttling = BaseThrottle()
         self.request = HttpRequest()
 
@@ -75,7 +75,7 @@ def test_get_ident_with_num_proxies(self, monkeypatch):
 
 
 class TestSimpleRateThrottle:
-    def setup(self):
+    def setup_method(self):
         SimpleRateThrottle.scope = "anon"
 
     def test_get_rate_raises_error_if_scope_is_missing(self):
@@ -125,7 +125,7 @@ def test_wait_returns_none_if_there_are_no_available_requests(self):
 
 
 class TestUserRateThrottle:
-    def setup(self):
+    def setup_method(self):
         self.throttle = UserRateThrottle()
         self.request = HttpRequest()
         self.request.user = None
@@ -148,7 +148,7 @@ def test_get_cache_key_returns_correct_value(self):
 
 
 class TestDynamicRateThrottle:
-    def setup(self):
+    def setup_method(self):
         self.request = HttpRequest()
         self.request.user = None
 

tests/test_throthling/test_throttle_controller.py

@@ -36,7 +36,7 @@ def endpoint_3(self, request):
 
 
 class TestThrottlingControllerSample:
-    def setup(self):
+    def setup_method(self):
         self.user = ThrottlingMockUser("Ninja")
         self.user.set_id(uuid.uuid4())
 

tests/test_throthling/test_throttle_decorator_on_controllers.py

@@ -33,7 +33,7 @@ def dynamic_throttling_scope(self, request):
 
 
 class TestThrottledController:
-    def setup(self):
+    def setup_method(self):
         self.user = ThrottlingMockUser("Ninja")
         self.user.set_id(uuid.uuid4())