🔀 Merge pull request #749

CI: avoid duplicate CI runs

.github/workflows/codecov.yml

@@ -2,6 +2,9 @@ name: Code Coverage
 
 on:
   push:
+    branches:
+      - master
+      - dev
   pull_request:
 
 jobs:

.github/workflows/website-deploy.yml

@@ -2,6 +2,9 @@ name: Build Upload Site
 
 on:
   push:
+    branches:
+      - master
+      - dev
   pull_request_target:
 
 jobs:

nonebot/config.py

@@ -12,16 +12,7 @@ import os
 from pathlib import Path
 from datetime import timedelta
 from ipaddress import IPv4Address
-from typing import (
+from typing import TYPE_CHECKING, Any, Set, Dict, Tuple, Union, Mapping, Optional
-    TYPE_CHECKING,
-    Any,
-    Set,
-    Dict,
-    Tuple,
-    Union,
-    Mapping,
-    Optional,
-)
 
 from pydantic import BaseSettings, IPvAnyAddress
 from pydantic.env_settings import (

nonebot/drivers/aiohttp.py

@@ -23,12 +23,7 @@ from nonebot.drivers import Request, Response
 from nonebot.exception import WebSocketClosed
 from nonebot.drivers._block_driver import BlockDriver
 from nonebot.drivers import WebSocket as BaseWebSocket
-from nonebot.drivers import (
+from nonebot.drivers import HTTPVersion, ForwardMixin, ForwardDriver, combine_driver
-    HTTPVersion,
-    ForwardMixin,
-    ForwardDriver,
-    combine_driver,
-)
 
 try:
     import aiohttp

nonebot/matcher.py

@@ -28,13 +28,7 @@ from nonebot.rule import Rule
 from nonebot.log import logger
 from nonebot.dependencies import Dependent
 from nonebot.permission import USER, Permission
-from nonebot.adapters import (
+from nonebot.adapters import Bot, Event, Message, MessageSegment, MessageTemplate
-    Bot,
-    Event,
-    Message,
-    MessageSegment,
-    MessageTemplate,
-)
 from nonebot.consts import (
     ARG_KEY,
     RECEIVE_KEY,

nonebot/permission.py

@@ -16,13 +16,7 @@ from nonebot.adapters import Bot, Event
 from nonebot.dependencies import Dependent
 from nonebot.exception import SkippedException
 from nonebot.typing import T_DependencyCache, T_PermissionChecker
-from nonebot.params import (
+from nonebot.params import BotParam, EventType, EventParam, DependParam, DefaultParam
-    BotParam,
-    EventType,
-    EventParam,
-    DependParam,
-    DefaultParam,
-)
 
 
 async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]):

nonebot/plugin/on.py

@@ -13,12 +13,7 @@ from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional
 from nonebot.matcher import Matcher
 from nonebot.permission import Permission
 from nonebot.dependencies import Dependent
-from nonebot.typing import (
+from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_PermissionChecker
-    T_State,
-    T_Handler,
-    T_RuleChecker,
-    T_PermissionChecker,
-)
 from nonebot.rule import (
     Rule,
     ArgumentParser,

nonebot/plugin/on.pyi

@@ -5,12 +5,7 @@ from nonebot.matcher import Matcher
 from nonebot.permission import Permission
 from nonebot.dependencies import Dependent
 from nonebot.rule import Rule, ArgumentParser
-from nonebot.typing import (
+from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_PermissionChecker
-    T_State,
-    T_Handler,
-    T_RuleChecker,
-    T_PermissionChecker,
-)
 
 def on(
     type: str = "",

tests/test_matcher.py

@@ -78,10 +78,7 @@ async def test_matcher(app: App, load_plugin):
 
 @pytest.mark.asyncio
 async def test_type_updater(app: App, load_plugin):
-    from plugins.matcher.matcher_type import (
+    from plugins.matcher.matcher_type import test_type_updater, test_custom_updater
-        test_type_updater,
-        test_custom_updater,
-    )
 
     event = make_fake_event()()