⬆️ remove Python 3.8 support

Author: ProgramRipper

nonebot_plugin_orm/__init__.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-import sys
 import logging
-from typing import Any
 from argparse import Namespace
 from functools import wraps, lru_cache
+from typing_extensions import Any, Annotated
 
 import click
 from nonebot.rule import Rule
@@ -25,11 +24,6 @@
 from .config import Config, plugin_config
 from .utils import LoguruHandler, StreamToLogger, coroutine, get_subclasses
 
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing_extensions import Annotated
-
 require("nonebot_plugin_localstore")
 from nonebot_plugin_localstore import get_data_dir
 

nonebot_plugin_orm/__main__.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import sys
 from pathlib import Path
-from typing import TypeVar
 from functools import wraps
 from argparse import Namespace
 from collections.abc import Callable, Iterable
+from typing_extensions import TypeVar, ParamSpec, Concatenate
 
 import click
 from alembic.script import Script
@@ -14,11 +13,6 @@
 from .config import plugin_config
 from .migrate import AlembicConfig
 
-if sys.version_info >= (3, 10):
-    from typing import ParamSpec, Concatenate
-else:
-    from typing_extensions import ParamSpec, Concatenate
-
 _P = ParamSpec("_P")
 _R = TypeVar("_R")
 

nonebot_plugin_orm/config.py

@@ -1,4 +1,3 @@
-import sys
 from pathlib import Path
 from typing import Any, Union, Optional
 
@@ -9,11 +8,6 @@
 
 from .migrate import AlembicConfig
 
-if sys.version_info >= (3, 9):
-    Dict = dict
-else:
-    from typing import Dict
-
 __all__ = (
     "Config",
     "plugin_config",
@@ -22,15 +16,15 @@
 
 class Config(BaseModel, arbitrary_types_allowed=True):
     sqlalchemy_database_url: Union[str, URL, AsyncEngine] = ""
-    sqlalchemy_binds: Dict[str, Union[str, URL, Dict[str, Any], AsyncEngine]] = {}
+    sqlalchemy_binds: dict[str, Union[str, URL, dict[str, Any], AsyncEngine]] = {}
     sqlalchemy_echo: bool = False
-    sqlalchemy_engine_options: Dict[str, Any] = {}
-    sqlalchemy_session_options: Dict[str, Any] = {}
+    sqlalchemy_engine_options: dict[str, Any] = {}
+    sqlalchemy_session_options: dict[str, Any] = {}
 
     alembic_config: Union[Path, AlembicConfig, None] = None
     alembic_script_location: Optional[Path] = None
-    alembic_version_locations: Union[Path, Dict[str, Path], None] = None
-    alembic_context: Dict[str, Any] = {}
+    alembic_version_locations: Union[Path, dict[str, Path], None] = None
+    alembic_context: dict[str, Any] = {}
     alembic_startup_check: bool = True
 
 

nonebot_plugin_orm/migrate.py

@@ -9,9 +9,9 @@
 from argparse import Namespace
 from operator import attrgetter
 from itertools import filterfalse
-from typing import Any, TextIO, cast
 from tempfile import TemporaryDirectory
 from configparser import DuplicateSectionError
+from typing_extensions import Any, Self, TextIO, cast
 from contextlib import ExitStack, suppress, contextmanager
 from collections.abc import Mapping, Iterable, Sequence, Generator
 
@@ -37,11 +37,6 @@
 from .exception import AutogenerateDiffsDetected
 from .utils import is_editable, get_parent_plugins, return_progressbar
 
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
-
 if sys.version_info >= (3, 12):
     from importlib.resources import files, as_file
 else:

nonebot_plugin_orm/model.py

@@ -1,19 +1,21 @@
 from __future__ import annotations
 
-import sys
 from inspect import Parameter, Signature
-from typing import TYPE_CHECKING, Any, ClassVar
+from typing_extensions import (
+    TYPE_CHECKING,
+    Any,
+    ClassVar,
+    Annotated,
+    get_args,
+    get_origin,
+    get_annotations,
+)
 
 from sqlalchemy import Table, MetaData
 from nonebot import get_plugin_by_module_name
 from sqlalchemy.orm import Mapped, DeclarativeBase
 
-from .utils import DependsInner, get_annotations
-
-if sys.version_info >= (3, 10):
-    from typing import Annotated, get_args, get_origin
-else:
-    from typing_extensions import Annotated, get_args, get_origin
+from .utils import DependsInner
 
 __all__ = ("Model",)
 

nonebot_plugin_orm/param.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import sys
-from itertools import repeat
-from typing import Any, cast
 from dataclasses import dataclass
 from operator import methodcaller
 from inspect import Parameter, isclass
+from collections.abc import Iterator, Sequence, AsyncIterator
+from typing_extensions import Any, Self, Annotated, cast, get_args, get_origin
 
 from pydantic.fields import FieldInfo
 from nonebot.dependencies import Param
@@ -18,29 +17,19 @@
 from .model import Model
 from .utils import Option, Dependency, generic_issubclass
 
-if sys.version_info >= (3, 11):
-    from typing import Annotated, get_args, get_origin
-    from collections.abc import Iterator, Sequence, AsyncIterator
-
-    Tuple = tuple
-    Type = type
-else:
-    from typing_extensions import Annotated, get_args, get_origin
-    from typing import Type, Tuple, Iterator, Sequence, AsyncIterator
-
 __all__ = (
     "SQLDepends",
     "ORMParam",
 )
 
 
 PATTERNS = {
-    AsyncIterator[Sequence[Row[Tuple[Any, ...]]]]: Option(
+    AsyncIterator[Sequence[Row[tuple[Any, ...]]]]: Option(
         True,
         False,
         (methodcaller("partitions"),),
     ),
-    AsyncIterator[Sequence[Tuple[Any, ...]]]: Option(
+    AsyncIterator[Sequence[tuple[Any, ...]]]: Option(
         True,
         False,
         (methodcaller("partitions"),),
@@ -50,12 +39,12 @@
         True,
         (methodcaller("partitions"),),
     ),
-    Iterator[Sequence[Row[Tuple[Any, ...]]]]: Option(
+    Iterator[Sequence[Row[tuple[Any, ...]]]]: Option(
         False,
         False,
         (methodcaller("partitions"),),
     ),
-    Iterator[Sequence[Tuple[Any, ...]]]: Option(
+    Iterator[Sequence[tuple[Any, ...]]]: Option(
         False,
         False,
         (methodcaller("partitions"),),
@@ -65,37 +54,37 @@
         True,
         (methodcaller("partitions"),),
     ),
-    AsyncResult[Tuple[Any, ...]]: Option(
+    AsyncResult[tuple[Any, ...]]: Option(
         True,
         False,
     ),
     AsyncScalarResult[Any]: Option(
         True,
         True,
     ),
-    Result[Tuple[Any, ...]]: Option(
+    Result[tuple[Any, ...]]: Option(
         False,
         False,
     ),
     ScalarResult[Any]: Option(
         False,
         True,
     ),
-    AsyncIterator[Row[Tuple[Any, ...]]]: Option(
+    AsyncIterator[Row[tuple[Any, ...]]]: Option(
         True,
         False,
     ),
-    Iterator[Row[Tuple[Any, ...]]]: Option(
+    Iterator[Row[tuple[Any, ...]]]: Option(
         False,
         False,
     ),
-    Sequence[Row[Tuple[Any, ...]]]: Option(
+    Sequence[Row[tuple[Any, ...]]]: Option(
         True,
         False,
         (),
         methodcaller("all"),
     ),
-    Sequence[Tuple[Any, ...]]: Option(
+    Sequence[tuple[Any, ...]]: Option(
         True,
         False,
         (),
@@ -107,7 +96,7 @@
         (),
         methodcaller("all"),
     ),
-    Tuple[Any, ...]: Option(
+    tuple[Any, ...]: Option(
         True,
         False,
         (),
@@ -142,7 +131,7 @@ class ORMParam(DependParam):
     @classmethod
     def _check_param(
         cls, param: Parameter, allow_types: tuple[type[Param], ...]
-    ) -> Param | None:
+    ) -> Self | None:
         type_annotation, depends_inner = param.annotation, None
         if get_origin(param.annotation) is Annotated:
             type_annotation, *extra_args = get_args(param.annotation)
@@ -205,5 +194,7 @@ def _check_param(
         )
 
     @classmethod
-    def _check_parameterless(cls, *_) -> None:
+    def _check_parameterless(
+        cls, value: Any, allow_types: tuple[type[Param], ...]
+    ) -> None:
         return