Upgrade isort

apragacz · May 8, 2023 · 7dd2aeb · 7dd2aeb
1 parent d4b1712
commit 7dd2aeb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/requirements/requirements-dev.lock.txt b/requirements/requirements-dev.lock.txt
@@ -146,7 +146,7 @@ flake8-comprehensions==3.12.0
     # via -r requirements/requirements-test.lock.txt
 flake8-debugger==4.1.2
     # via -r requirements/requirements-test.lock.txt
-flake8-isort==5.0.3
+flake8-isort==6.0.0
     # via -r requirements/requirements-test.lock.txt
 flake8-print==5.0.0
     # via -r requirements/requirements-test.lock.txt
@@ -182,7 +182,7 @@ ipython==8.12.2
     # via
     #   -r requirements/requirements-dev.in
     #   ipdb
-isort[pyproject]==4.3.21
+isort[pyproject]==5.12.0
     # via
     #   -r requirements/requirements-test.lock.txt
     #   flake8-isort
@@ -426,10 +426,6 @@ stevedore==5.0.0
     # via
     #   -r requirements/requirements-test.lock.txt
     #   doc8
-toml==0.10.2
-    # via
-    #   -r requirements/requirements-test.lock.txt
-    #   isort
 tomli==2.0.1
     # via
     #   -r requirements/requirements-test.lock.txt

diff --git a/requirements/requirements-test.in b/requirements/requirements-test.in
@@ -6,7 +6,7 @@ flake8-isort
 flake8-pyproject
 flake8-print
 flake8-tuple
-isort[pyproject]<5.0
+isort[pyproject]
 pylint
 
 # type checking

diff --git a/requirements/requirements-test.lock.txt b/requirements/requirements-test.lock.txt
@@ -94,7 +94,7 @@ flake8-comprehensions==3.12.0
     # via -r requirements/requirements-test.in
 flake8-debugger==4.1.2
     # via -r requirements/requirements-test.in
-flake8-isort==5.0.3
+flake8-isort==6.0.0
     # via -r requirements/requirements-test.in
 flake8-print==5.0.0
     # via -r requirements/requirements-test.in
@@ -115,7 +115,7 @@ importlib-resources==5.12.0
     # via keyring
 iniconfig==2.0.0
     # via pytest
-isort[pyproject]==4.3.21
+isort[pyproject]==5.12.0
     # via
     #   -r requirements/requirements-test.in
     #   flake8-isort
@@ -269,8 +269,6 @@ sqlparse==0.4.4
     #   django
 stevedore==5.0.0
     # via doc8
-toml==0.10.2
-    # via isort
 tomli==2.0.1
     # via
     #   build

diff --git a/rest_registration/auth_token_managers.py b/rest_registration/auth_token_managers.py
@@ -65,15 +65,17 @@ def get_app_names(self) -> Sequence[str]:
         ]
 
     def provide_token(self, user: 'AbstractBaseUser') -> AuthToken:
-        from rest_framework.authtoken.models import Token  # noqa: E501 pylint: disable=import-outside-toplevel
+        from rest_framework.authtoken.models import \
+            Token  # noqa: E501 pylint: disable=import-outside-toplevel
 
         token_obj, _ = Token.objects.get_or_create(user=user)
         return AuthToken(token_obj.key)
 
     def revoke_token(
             self, user: 'AbstractBaseUser', *,
             token: Optional[AuthToken] = None) -> None:
-        from rest_framework.authtoken.models import Token  # noqa: E501 pylint: disable=import-outside-toplevel
+        from rest_framework.authtoken.models import \
+            Token  # noqa: E501 pylint: disable=import-outside-toplevel
 
         try:
             token_obj = Token.objects.get(user_id=user.pk)  # type: Token

diff --git a/rest_registration/enums.py b/rest_registration/enums.py
@@ -9,7 +9,9 @@
 class _BaseCheckCodeMixin(CheckCode):  # noqa: E501 pylint: disable=abstract-method
 
     def get_app_name(self) -> str:
-        from rest_registration.apps import RestRegistrationConfig  # noqa: E501 pylint: disable=import-outside-toplevel, cyclic-import
+        from rest_registration.apps import \
+            RestRegistrationConfig  # noqa: E501 pylint: disable=import-outside-toplevel, cyclic-import
+
         return RestRegistrationConfig.name
 
 

diff --git a/rest_registration/utils/types.py b/rest_registration/utils/types.py
@@ -2,7 +2,6 @@
 
 if TYPE_CHECKING:
     from django_stubs_ext import StrOrPromise
-
     # mypy uses typing_extensions by default (Py 3.8); when importing from typing
     # one will get the following error message in mypy:
     #

diff --git a/rest_registration/utils/users.py b/rest_registration/utils/users.py
@@ -28,6 +28,7 @@
 
 if TYPE_CHECKING:
     from typing import Optional
+
     from django.contrib.auth.base_user import AbstractBaseUser
     from django.contrib.contenttypes.fields import GenericForeignKey
     from django.db.models import Field, ForeignObjectRel

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -139,7 +139,8 @@ def user(db, email_change, password_change):
 
 @pytest.fixture()
 def user_token_obj(user):
-    from rest_framework.authtoken.models import Token  # noqa: E501 pylint: disable=import-outside-toplevel
+    from rest_framework.authtoken.models import \
+        Token  # noqa: E501 pylint: disable=import-outside-toplevel
 
     return Token.objects.create(user=user)