Update isort version to 5.13.2; Disable import ordering in ruff; Add isort to make lint (CTFd#2455)

* Update isort version to 5.13.2
* Disable import ordering in ruff
* Add isort to make lint

Author: ColdHeat

CTFd/cache/__init__.py

@@ -60,16 +60,16 @@ def clear_config():
 
 
 def clear_standings():
-    from CTFd.models import Users, Teams  # noqa: I001
+    from CTFd.api import api
+    from CTFd.api.v1.scoreboard import ScoreboardDetail, ScoreboardList
     from CTFd.constants.static import CacheKeys
+    from CTFd.models import Teams, Users  # noqa: I001
     from CTFd.utils.scores import get_standings, get_team_standings, get_user_standings
-    from CTFd.api.v1.scoreboard import ScoreboardDetail, ScoreboardList
-    from CTFd.api import api
     from CTFd.utils.user import (
-        get_user_score,
-        get_user_place,
-        get_team_score,
         get_team_place,
+        get_team_score,
+        get_user_place,
+        get_user_score,
     )
 
     # Clear out the bulk standings functions
@@ -100,9 +100,11 @@ def clear_standings():
 
 def clear_challenges():
     from CTFd.utils.challenges import get_all_challenges  # noqa: I001
-    from CTFd.utils.challenges import get_solves_for_challenge_id
-    from CTFd.utils.challenges import get_solve_ids_for_user_id
-    from CTFd.utils.challenges import get_solve_counts_for_challenges
+    from CTFd.utils.challenges import (
+        get_solve_counts_for_challenges,
+        get_solve_ids_for_user_id,
+        get_solves_for_challenge_id,
+    )
 
     cache.delete_memoized(get_all_challenges)
     cache.delete_memoized(get_solves_for_challenge_id)
@@ -127,8 +129,8 @@ def clear_user_session(user_id):
     from CTFd.utils.user import (  # noqa: I001
         get_user_attrs,
         get_user_place,
-        get_user_score,
         get_user_recent_ips,
+        get_user_score,
     )
 
     cache.delete_memoized(get_user_attrs, user_id=user_id)
@@ -141,8 +143,8 @@ def clear_all_user_sessions():
     from CTFd.utils.user import (  # noqa: I001
         get_user_attrs,
         get_user_place,
-        get_user_score,
         get_user_recent_ips,
+        get_user_score,
     )
 
     cache.delete_memoized(get_user_attrs)

CTFd/models/__init__.py

@@ -533,8 +533,8 @@ def get_place(self, admin=False, numeric=False):
         to no imports within the CTFd application as importing from the
         application itself will result in a circular import.
         """
-        from CTFd.utils.scores import get_user_standings  # noqa: I001
         from CTFd.utils.humanize.numbers import ordinalize
+        from CTFd.utils.scores import get_user_standings
 
         standings = get_user_standings(admin=admin)
 
@@ -659,7 +659,8 @@ def get_fields(self, admin=False):
 
     def get_invite_code(self):
         from flask import current_app  # noqa: I001
-        from CTFd.utils.security.signing import serialize, hmac
+
+        from CTFd.utils.security.signing import hmac, serialize
 
         secret_key = current_app.config["SECRET_KEY"]
         if isinstance(secret_key, str):
@@ -678,13 +679,14 @@ def get_invite_code(self):
     @classmethod
     def load_invite_code(cls, code):
         from flask import current_app  # noqa: I001
+
+        from CTFd.exceptions import TeamTokenExpiredException, TeamTokenInvalidException
         from CTFd.utils.security.signing import (
-            unserialize,
-            hmac,
-            BadTimeSignature,
             BadSignature,
+            BadTimeSignature,
+            hmac,
+            unserialize,
         )
-        from CTFd.exceptions import TeamTokenExpiredException, TeamTokenInvalidException
 
         secret_key = current_app.config["SECRET_KEY"]
         if isinstance(secret_key, str):
@@ -776,8 +778,8 @@ def get_place(self, admin=False, numeric=False):
         to no imports within the CTFd application as importing from the
         application itself will result in a circular import.
         """
-        from CTFd.utils.scores import get_team_standings  # noqa: I001
         from CTFd.utils.humanize.numbers import ordinalize
+        from CTFd.utils.scores import get_team_standings  # noqa: I001
 
         standings = get_team_standings(admin=admin)
 

CTFd/utils/initialization/__init__.py

@@ -65,8 +65,8 @@ def init_template_globals(app):
     from CTFd.constants.plugins import Plugins
     from CTFd.constants.sessions import Session
     from CTFd.constants.static import Static
-    from CTFd.constants.users import User
     from CTFd.constants.teams import Team
+    from CTFd.constants.users import User
     from CTFd.forms import Forms
     from CTFd.utils.config.visibility import (
         accounts_visible,

Makefile

@@ -1,12 +1,13 @@
 lint:
-	ruff check --select E,F,W,B,C4,I --ignore E402,E501,E712,B904,B905 --exclude=CTFd/uploads CTFd/ migrations/ tests/
+	ruff check --select E,F,W,B,C4,I --ignore E402,E501,E712,B904,B905,I001 --exclude=CTFd/uploads CTFd/ migrations/ tests/
+	isort --profile=black --check-only --skip=CTFd/uploads -rc CTFd/ tests/
 	yarn lint
 	black --check --diff --exclude=CTFd/uploads --exclude=node_modules .
 	prettier --check 'CTFd/themes/**/assets/**/*'
 	prettier --check '**/*.md'
 
 format:
-	isort --skip=CTFd/uploads -rc CTFd/ tests/
+	isort --profile=black --skip=CTFd/uploads -rc CTFd/ tests/
 	black --exclude=CTFd/uploads --exclude=node_modules .
 	prettier --write 'CTFd/themes/**/assets/**/*'
 	prettier --write '**/*.md'

linting.txt

@@ -1,4 +1,4 @@
 black==22.3.0
-isort==4.3.21
+isort==5.13.2
 ruff==0.0.260
 dennis==1.1.0

tests/cache/test_challenges.py

@@ -61,8 +61,8 @@ def test_deleting_challenge_clears_cache_solves():
             challenge = data[0]
             assert challenge["solves"] == 1
             from CTFd.utils.challenges import (  # noqa: I001
-                get_solves_for_challenge_id,
                 get_solve_counts_for_challenges,
+                get_solves_for_challenge_id,
             )
 
             solves = get_solves_for_challenge_id(1)
@@ -101,8 +101,8 @@ def test_deleting_solve_clears_cache():
             challenge = data[0]
             assert challenge["solves"] == 1
             from CTFd.utils.challenges import (  # noqa: I001
-                get_solves_for_challenge_id,
                 get_solve_counts_for_challenges,
+                get_solves_for_challenge_id,
             )
 
             solves = get_solves_for_challenge_id(1)

tests/constants/test_constants.py

@@ -24,9 +24,10 @@ class Numbers(str, RawEnum):
 
 
 def test_JSEnum():
-    from CTFd.constants import JS_ENUMS  # noqa: I001
     import json
 
+    from CTFd.constants import JS_ENUMS  # noqa: I001
+
     @JSEnum
     class Colors(str, RawEnum):
         RED = "red"