Switch to isort for black compatibility

.pre-commit-config.yaml

@@ -21,11 +21,11 @@ repos:
     hooks:
     -   id: pyupgrade
         args: [--py39-plus, --keep-runtime-typing]
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+-   repo: https://github.com/pycqa/isort
+    rev: 5.13.2
     hooks:
-    -   id: reorder-python-imports
-        args: [--py39-plus, --add-import, 'from __future__ import annotations']
+      - id: isort
+        args: [--profile, black, --add-import, from __future__ import annotations, --force-single-line-imports]
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:

common/constants/actions.py

@@ -1,4 +1,5 @@
 """Contains user actions"""
+
 from __future__ import annotations
 
 IDLE = 0

common/log/logger.py

@@ -10,7 +10,6 @@
 
 from typing_extensions import TypeAlias
 
-
 LOG_CONTEXT: ContextVar[Optional[dict[str, Any]]] = ContextVar(
     "LOG_CONTEXT",
     default=None,

constants/dataTypes.py

@@ -1,4 +1,5 @@
 """Bancho packets data types"""
+
 from __future__ import annotations
 
 BYTE = 0

constants/packetIDs.py

@@ -1,4 +1,5 @@
 """Contain server and client packet IDs"""
+
 from __future__ import annotations
 
 client_changeAction = 0

constants/serverPackets.py

@@ -1,4 +1,5 @@
 """ Contains functions used to write specific server packets to byte streams """
+
 from __future__ import annotations
 
 from typing import Optional
@@ -15,7 +16,6 @@
 from objects import osuToken
 from objects import tokenList
 
-
 # TODO: any packet using async/await should likely
 # be refactored to accept the data as a parameter
 # such that this can be just be a serialization layer

irc/ircserver.py

@@ -6,6 +6,7 @@
 Most of the reference code from miniircd was used for the low-level logic.
 The high-level code has been rewritten to make it compatible with bancho-service.
 """
+
 # NOTE(2023-08-10): this is currently deprecated within akatsuki and is not functional
 # here because we may use it in the future - perhaps for deletion eventually.
 from __future__ import annotations

objects/dbPool.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from typing import cast
 from typing import Optional
+from typing import cast
 
 import aiomysql
 

objects/glob.py

@@ -1,9 +1,10 @@
 """Global objects and variables"""
+
 from __future__ import annotations
 
 import time
-from typing import Optional
 from typing import TYPE_CHECKING
+from typing import Optional
 
 import httpx
 from amplitude import Amplitude
@@ -14,9 +15,9 @@
 if TYPE_CHECKING:
     from redis.asyncio import Redis
 
-    from objects.dbPool import DBPool
     from irc.ircserver import Server as IRCServer
     from objects.banchoConfig import banchoConfig
+    from objects.dbPool import DBPool
 
 
 BOT_NAME = "Aika"

workers/crons/reset_all_tokens_spam_rate.py

@@ -6,7 +6,6 @@
 import os
 import sys
 
-
 sys.path.insert(1, os.path.join(sys.path[0], "../.."))
 
 import lifecycle

workers/crons/timeout_inactive_tokens.py

@@ -13,10 +13,10 @@
 from common import exception_handling
 from common.log import logger
 from common.log import logging_config
+from constants import CHATBOT_USER_ID
 from events import logoutEvent
 from objects import osuToken
 from objects.redisLock import redisLock
-from constants import CHATBOT_USER_ID
 
 OSU_MAX_PING_INTERVAL = 300  # seconds
 

workers/daemons/consume_pubsub_events.py

@@ -6,7 +6,6 @@
 import os
 import sys
 
-
 sys.path.insert(1, os.path.join(sys.path[0], "../.."))
 
 import lifecycle