update dependencies (#29)

* update dependencies

* update codecov.yml

Author: MeetWq

.github/workflows/codecov.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: false
     env:

.gitignore

@@ -3,3 +3,4 @@ dist/
 .vscode/
 data/
 .env
+node_modules/

.pre-commit-config.yaml

@@ -12,18 +12,6 @@ repos:
         args: [--fix, --exit-non-zero-on-fix]
         stages: [commit]
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [commit]
-
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
-        stages: [commit]
-
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:

README.md

@@ -10,8 +10,8 @@ _✨ [Nonebot2](https://github.com/nonebot/nonebot2) 会话信息提取与会话
 
 <p align="center">
   <img src="https://img.shields.io/github/license/noneplugin/nonebot-plugin-session" alt="license">
-  <img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="Python">
-  <img src="https://img.shields.io/badge/nonebot-2.0.0+-red.svg" alt="NoneBot">
+  <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="Python">
+  <img src="https://img.shields.io/badge/nonebot-2.3.0+-red.svg" alt="NoneBot">
   <a href="https://pypi.org/project/nonebot-plugin-session">
     <img src="https://badgen.net/pypi/v/nonebot-plugin-session" alt="pypi">
   </a>

nonebot_plugin_session/extractor.py

@@ -1,8 +1,7 @@
-from typing import Generic, List, NamedTuple, Optional, Type, TypeVar, Union
+from typing import Annotated, Generic, NamedTuple, Optional, TypeVar, Union
 
 from nonebot.adapters import Bot, Event
 from nonebot.params import Depends
-from typing_extensions import Annotated
 
 from .const import SupportedPlatform
 from .session import Session, SessionIdType, SessionLevel
@@ -53,16 +52,16 @@ def extract(self) -> Session:
 
 
 class SessionExtractorTuple(NamedTuple):
-    bot: Type[Bot]
-    event: Type[Event]
-    extractor: Type[SessionExtractor]
+    bot: type[Bot]
+    event: type[Event]
+    extractor: type[SessionExtractor]
 
 
-_session_extractors: List[SessionExtractorTuple] = []
+_session_extractors: list[SessionExtractorTuple] = []
 
 
-def register_session_extractor(bot: Type[Bot], event: Type[Event]):
-    def wrapper(extractor: Type[SessionExtractor]):
+def register_session_extractor(bot: type[Bot], event: type[Event]):
+    def wrapper(extractor: type[SessionExtractor]):
         _session_extractors.append(SessionExtractorTuple(bot, event, extractor))
         return extractor
 
@@ -87,7 +86,7 @@ def SessionId(
     include_platform: bool = True,
     include_bot_type: bool = True,
     include_bot_id: bool = True,
-    seperator: str = "_"
+    seperator: str = "_",
 ):
     def dependency(bot: Bot, event: Event) -> str:
         session = extract_session(bot, event)

nonebot_plugin_session/session.py

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 from pydantic import BaseModel
 
@@ -63,7 +63,7 @@ def get_id(
         include_id2 = bool((id_type >> 1) & 1)
         include_id3 = bool((id_type >> 2) & 1)
 
-        parts: List[str] = []
+        parts: list[str] = []
         if include_platform:
             parts.append(self.platform)
         if include_bot_type:

poetry.lock

@@ -9,15 +9,15 @@ homepage = "https://github.com/noneplugin/nonebot-plugin-session"
 repository = "https://github.com/noneplugin/nonebot-plugin-session"
 
 [tool.poetry.dependencies]
-python = "^3.8"
-nonebot2 = "^2.0.0"
-strenum = "^0.4.8"
+python = "^3.9"
+nonebot2 = "^2.3.0"
+strenum = "^0.4.15"
 
 [tool.poetry.group.dev.dependencies]
 
 [tool.poetry.group.test.dependencies]
-pytest-cov = "^4.0.0"
-pytest-asyncio = "^0.20.0"
+pytest-cov = "^5.0.0"
+pytest-asyncio = "^0.23.0"
 nonebug = "^0.3.0"
 websockets = { version = ">=10.0" }
 fastapi = { version = ">=0.93.0,<1.0.0" }
@@ -28,28 +28,33 @@ uvicorn = { version = ">=0.20.0,<1.0.0", extras = ["standard"] }
 optional = true
 
 [tool.poetry.group.adapters.dependencies]
-nonebot-adapter-onebot = "^2.4.0"
-nonebot-adapter-console = "^0.5.0"
-nonebot-adapter-kaiheila = "^0.3.1"
-nonebot-adapter-telegram = { git = "https://github.com/nonebot/adapter-telegram.git" }
-nonebot-adapter-feishu = "^2.4.0"
+nonebot-adapter-onebot = "^2.4.4"
+nonebot-adapter-console = "^0.6.0"
+nonebot-adapter-kaiheila = "^0.3.4"
+nonebot-adapter-telegram = "^0.1.0b17"
+nonebot-adapter-feishu = "^2.6.2"
 nonebot-adapter-red = "^0.9.0"
-nonebot-adapter-discord = { git = "https://github.com/nonebot/adapter-discord.git" }
-nonebot-adapter-satori = "^0.9.3"
-nonebot-adapter-qq = "^1.4.1"
-nonebot-adapter-dodo = "^0.2.0"
+nonebot-adapter-discord = "^0.1.8"
+nonebot-adapter-satori = "^0.12.3"
+nonebot-adapter-qq = "^1.5.0"
+nonebot-adapter-dodo = "^0.2.1"
 
 [tool.nonebot]
 plugins = ["nonebot_plugin_session"]
 adapters = [
   { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" },
 ]
 
-[tool.isort]
-profile = "black"
-skip_gitignore = true
+[tool.pyright]
+pythonVersion = "3.9"
+pythonPlatform = "All"
+typeCheckingMode = "basic"
 
 [tool.ruff]
+line-length = 88
+target-version = "py39"
+
+[tool.ruff.lint]
 select = ["E", "W", "F", "UP", "C", "T", "PYI", "Q"]
 ignore = ["E402", "E501", "E711", "C901", "UP037"]
 

pyproject.toml

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import TYPE_CHECKING, Set
+from typing import TYPE_CHECKING
 
 import nonebot
 import pytest
@@ -25,6 +25,6 @@ async def app():
 
 
 @pytest.fixture(scope="session", autouse=True)
-def load_plugin(nonebug_init: None) -> Set["Plugin"]:
+def load_plugin(nonebug_init: None) -> set["Plugin"]:
     # preload global plugins
     return nonebot.load_plugins(str(Path(__file__).parent / "plugins"))