Develop: 完全使用 ruff 替代 isort 与 black (#1757)

* 🚨 完全使用 ruff 替代 isort 与 black

* 🚨 ruff lint&format

tests/builtin_plugins/auto_update/test_check_update.py

@@ -1,20 +1,20 @@
+from collections.abc import Callable
 import io
 import os
-import tarfile
-import zipfile
-from typing import cast
 from pathlib import Path
-from collections.abc import Callable
+import tarfile
+from typing import cast
+import zipfile
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.config import BotId, UserId, GroupId, MessageId
-from tests.utils import get_response_json as _get_response_json
+from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event, _v11_private_message_send
+from tests.utils import get_response_json as _get_response_json
 
 
 def get_response_json(file: str) -> dict:
@@ -62,10 +62,10 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
     zip_bytes = io.BytesIO()
 
     from zhenxun.builtin_plugins.auto_update.config import (
-        REPLACE_FOLDERS,
-        REQ_TXT_FILE_STRING,
         PYPROJECT_FILE_STRING,
         PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
     )
 
     # 指定要添加到压缩文件中的文件路径列表
@@ -196,10 +196,10 @@ def add_directory_to_tar(tarinfo, tar):
 
 def init_mocker_path(mocker: MockerFixture, tmp_path: Path):
     from zhenxun.builtin_plugins.auto_update.config import (
-        REQ_TXT_FILE_STRING,
-        VERSION_FILE_STRING,
         PYPROJECT_FILE_STRING,
         PYPROJECT_LOCK_FILE_STRING,
+        REQ_TXT_FILE_STRING,
+        VERSION_FILE_STRING,
     )
 
     mocker.patch(
@@ -268,10 +268,10 @@ async def test_check_update_release(
     """
     from zhenxun.builtin_plugins.auto_update import _matcher
     from zhenxun.builtin_plugins.auto_update.config import (
-        REPLACE_FOLDERS,
-        REQ_TXT_FILE_STRING,
         PYPROJECT_FILE_STRING,
         PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
     )
 
     init_mocked_api(mocked_api=mocked_api)
@@ -359,10 +359,10 @@ async def test_check_update_dev(
     """
     from zhenxun.builtin_plugins.auto_update import _matcher
     from zhenxun.builtin_plugins.auto_update.config import (
-        REPLACE_FOLDERS,
-        REQ_TXT_FILE_STRING,
         PYPROJECT_FILE_STRING,
         PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
     )
 
     init_mocked_api(mocked_api=mocked_api)
@@ -450,10 +450,10 @@ async def test_check_update_main(
     """
     from zhenxun.builtin_plugins.auto_update import _matcher
     from zhenxun.builtin_plugins.auto_update.config import (
-        REPLACE_FOLDERS,
-        REQ_TXT_FILE_STRING,
         PYPROJECT_FILE_STRING,
         PYPROJECT_LOCK_FILE_STRING,
+        REPLACE_FOLDERS,
+        REQ_TXT_FILE_STRING,
     )
 
     init_mocked_api(mocked_api=mocked_api)

tests/builtin_plugins/check/test_check.py

@@ -1,17 +1,17 @@
+from collections.abc import Callable
+from pathlib import Path
 import platform
 from typing import cast
-from pathlib import Path
-from collections.abc import Callable
 
 import nonebot
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 
 platform_uname = platform.uname_result(
     system="Linux",
@@ -67,9 +67,9 @@ async def test_check(
     """
     测试自检
     """
-    from zhenxun.configs.config import BotConfig
     from zhenxun.builtin_plugins.check import _matcher
     from zhenxun.builtin_plugins.check.data_source import __get_version
+    from zhenxun.configs.config import BotConfig
 
     (
         mock_psutil,
@@ -137,9 +137,9 @@ async def test_check_arm(
     """
     测试自检（arm）
     """
-    from zhenxun.configs.config import BotConfig
     from zhenxun.builtin_plugins.check import _matcher
     from zhenxun.builtin_plugins.check.data_source import __get_version
+    from zhenxun.configs.config import BotConfig
 
     platform_uname_arm = platform.uname_result(
         system="Linux",

tests/builtin_plugins/plugin_store/test_add_plugin.py

@@ -1,18 +1,18 @@
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-import pytest
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+import pytest
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 from tests.builtin_plugins.plugin_store.utils import init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
+from tests.utils import _v11_group_message_event
 
 
 @pytest.mark.parametrize("package_api", ["jsd", "gh"])

tests/builtin_plugins/plugin_store/test_plugin_store.py

@@ -1,16 +1,16 @@
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot, Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 from tests.builtin_plugins.plugin_store.utils import init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
+from tests.utils import _v11_group_message_event
 
 
 async def test_plugin_store(

tests/builtin_plugins/plugin_store/test_remove_plugin.py

@@ -1,19 +1,19 @@
 # ruff: noqa: ASYNC230
 
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
+from tests.builtin_plugins.plugin_store.utils import get_content_bytes, init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
-from tests.builtin_plugins.plugin_store.utils import init_mocked_api, get_content_bytes
 
 
 async def test_remove_plugin(

tests/builtin_plugins/plugin_store/test_search_plugin.py

@@ -1,17 +1,17 @@
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 from tests.builtin_plugins.plugin_store.utils import init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
+from tests.utils import _v11_group_message_event
 
 
 async def test_search_plugin_name(

tests/builtin_plugins/plugin_store/test_update_all_plugin.py

@@ -1,17 +1,17 @@
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 from tests.builtin_plugins.plugin_store.utils import init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
+from tests.utils import _v11_group_message_event
 
 
 async def test_update_all_plugin_basic_need_update(
@@ -36,7 +36,6 @@ async def test_update_all_plugin_basic_need_update(
         return_value=[("search_image", "0.0")],
     )
 
-
     async with app.test_matcher(_matcher) as ctx:
         bot = create_bot(ctx)
         bot: Bot = cast(Bot, bot)
@@ -90,7 +89,6 @@ async def test_update_all_plugin_basic_is_new(
         return_value=[("search_image", "0.1")],
     )
 
-
     async with app.test_matcher(_matcher) as ctx:
         bot = create_bot(ctx)
         bot: Bot = cast(Bot, bot)

tests/builtin_plugins/plugin_store/test_update_plugin.py

@@ -1,17 +1,17 @@
-from typing import cast
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
+from typing import cast
 
-from nonebug import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.adapters.onebot.v11.message import Message
+from nonebug import App
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
-from tests.utils import _v11_group_message_event
-from tests.config import BotId, UserId, GroupId, MessageId
 from tests.builtin_plugins.plugin_store.utils import init_mocked_api
+from tests.config import BotId, GroupId, MessageId, UserId
+from tests.utils import _v11_group_message_event
 
 
 async def test_update_plugin_basic_need_update(

tests/conftest.py

@@ -1,15 +1,15 @@
-import os
-import json
-from pathlib import Path
 from collections.abc import Callable
+import json
+import os
+from pathlib import Path
 
-import pytest
 import nonebot
-from nonebug.app import App
-from respx import MockRouter
-from pytest_mock import MockerFixture
 from nonebug import NONEBOT_INIT_KWARGS
+from nonebug.app import App
 from nonebug.mixin.process import MatcherContext
+import pytest
+from pytest_mock import MockerFixture
+from respx import MockRouter
 
 from tests.config import BotId, UserId
 
@@ -61,7 +61,7 @@ def _init_bot(nonebug_init: None):
 
 @pytest.fixture
 async def app(app: App, tmp_path: Path, mocker: MockerFixture):
-    from zhenxun.services.db_context import init, disconnect
+    from zhenxun.services.db_context import disconnect, init
 
     driver = nonebot.get_driver()
     # 清除连接钩子，现在 NoneBug 会自动触发 on_bot_connect
@@ -89,7 +89,7 @@ async def app(app: App, tmp_path: Path, mocker: MockerFixture):
 
 @pytest.fixture
 def create_bot() -> Callable:
-    from nonebot.adapters.onebot.v11 import Bot, Adapter
+    from nonebot.adapters.onebot.v11 import Adapter, Bot
 
     def _create_bot(context: MatcherContext) -> Bot:
         return context.create_bot(

tests/utils.py

@@ -1,8 +1,8 @@
 import json
 from pathlib import Path
 
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message, MessageSegment
 from nonebot.adapters.onebot.v11.event import Sender
-from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEvent
 
 
 def get_response_json(base_path: Path, file: str) -> dict: