chore: Update dependencies, add upper bounds for Python and package versions, and reorder imports.

fllesser · fllesser · commit 115ff4ba8e27 · 2025-11-28T23:22:10.000+08:00
chore: Replace Poetry with UV for dependency management in devcontainer.

Chore: Rename Codecov workflow job name to 'Test Coverage'.

build: update ruff pre-commit hook to v0.14.6
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,9 +2,9 @@
   "name": "Default Linux Universal",
   "image": "mcr.microsoft.com/devcontainers/universal:2-linux",
   "features": {
-    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
+    "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
   },
-  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install && poetry run pre-commit install",
+  "postCreateCommand": "uv sync && uv run pre-commit install",
   "customizations": {
     "vscode": {
       "settings": {
@@ -49,4 +49,4 @@
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -7,12 +7,20 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: Run Pytest and Upload Coverage
+    name: Test Coverage
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
+        with:
+          python-version: ${{ matrix.python-version }}
 
       - name: Run Pytest
         run: uv run pytest --cov-report xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,30 +12,28 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
 
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(poetry version -s)" >> $GITHUB_OUTPUT
+          echo "VERSION=$(uv version --short)" >> $GITHUB_OUTPUT
           echo "TAG_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
           echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Check Version
         if: steps.version.outputs.VERSION != steps.version.outputs.TAG_VERSION
         run: exit 1
 
-      - name: Build Package
-        run: uv build
-
-      - name: Publish Package to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Build and Publish Package
+        run: | 
+          uv build
+          uv publish
 
       - name: Publish Package to GitHub
-        run: |
-          gh release upload --clobber ${{ steps.version.outputs.TAG_NAME }} dist/*.tar.gz dist/*.whl
+        run: gh release upload --clobber ${{ steps.version.outputs.TAG_NAME }} dist/*.tar.gz dist/*.whl
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
@@ -15,7 +15,7 @@ jobs:
     name: Ruff Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Run Ruff Lint
-        uses: chartboost/ruff-action@v1
+        uses: astral-sh/ruff-action@v3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.5
+    rev: v0.14.6
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
diff --git a/nonebug/__init__.py b/nonebug/__init__.py
diff --git a/nonebug/app.py b/nonebug/app.py
diff --git a/nonebug/base.py b/nonebug/base.py
diff --git a/nonebug/fixture.py b/nonebug/fixture.py
diff --git a/nonebug/mixin/__init__.py b/nonebug/mixin/__init__.py
diff --git a/nonebug/mixin/call_api/__init__.py b/nonebug/mixin/call_api/__init__.py
@@ -1,13 +1,13 @@
-import contextlib
 from queue import Queue
 from typing import TYPE_CHECKING, Any, Union, TypeVar, Optional, overload
+import contextlib
 
 import pytest
 
 from nonebug.base import BaseApp, Context
 
-from .model import Api, Send, Model
 from .fake import make_fake_bot, make_fake_adapter
+from .model import Api, Send, Model
 
 if TYPE_CHECKING:
     from nonebot.adapters import Bot, Event, Adapter, Message, MessageSegment
diff --git a/nonebug/mixin/call_api/fake.py b/nonebug/mixin/call_api/fake.py
@@ -1,5 +1,5 @@
-from typing_extensions import override
 from typing import TYPE_CHECKING, Any, Union, TypeVar, overload
+from typing_extensions import override
 
 if TYPE_CHECKING:
     from nonebot.adapters import Bot, Event, Adapter, Message, MessageSegment
diff --git a/nonebug/mixin/call_api/model.py b/nonebug/mixin/call_api/model.py
@@ -1,5 +1,5 @@
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Union, Optional
+from dataclasses import dataclass
 
 if TYPE_CHECKING:
     from nonebot.adapters import Bot, Event, Adapter, Message, MessageSegment
diff --git a/nonebug/mixin/dependent.py b/nonebug/mixin/dependent.py
@@ -1,8 +1,7 @@
-from typing_extensions import final
-from collections.abc import Iterable
-from contextlib import AsyncExitStack
 from typing import TYPE_CHECKING, Any, Union
-from collections.abc import Callable
+from contextlib import AsyncExitStack
+from collections.abc import Callable, Iterable
+from typing_extensions import final
 
 import pytest
 
diff --git a/nonebug/mixin/driver.py b/nonebug/mixin/driver.py
diff --git a/nonebug/mixin/process/__init__.py b/nonebug/mixin/process/__init__.py
@@ -1,8 +1,8 @@
-from contextvars import ContextVar
+from typing import TYPE_CHECKING, Literal, TypedDict
+from contextlib import contextmanager
 from collections import defaultdict
+from contextvars import ContextVar
 from typing_extensions import final
-from contextlib import contextmanager
-from typing import TYPE_CHECKING, Literal, TypedDict
 
 import pytest
 from _pytest.outcomes import Skipped
diff --git a/nonebug/mixin/process/fake.py b/nonebug/mixin/process/fake.py
@@ -1,7 +1,6 @@
-from collections.abc import Awaitable
-from typing_extensions import ParamSpec
 from typing import TYPE_CHECKING
-from collections.abc import Callable
+from collections.abc import Callable, Awaitable
+from typing_extensions import ParamSpec
 
 from _pytest.outcomes import OutcomeException
 
diff --git a/nonebug/mixin/process/model.py b/nonebug/mixin/process/model.py
@@ -1,5 +1,5 @@
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, ClassVar
+from dataclasses import dataclass
 
 from _pytest.outcomes import OutcomeException
 
diff --git a/nonebug/provider.py b/nonebug/provider.py
@@ -1,7 +1,7 @@
 from copy import deepcopy
-from collections import defaultdict
-from contextlib import contextmanager
 from typing import TypeVar, overload
+from contextlib import contextmanager
+from collections import defaultdict
 from collections.abc import (
     Mapping,
     Iterator,
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ name = "nonebug"
 version = "0.4.3"
 description = "nonebot2 test framework"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.10, <4.0"
 license = "MIT"
 authors = [
   { name = "AkiraXie", email = "l997460364@outlook.com" },
@@ -12,10 +12,10 @@ authors = [
 keywords = ["bot", "cqhttp", "nonebot", "onebot", "pytest", "test"]
 classifiers = ["Framework :: Pytest"]
 dependencies = [
-  "asgiref >=3.10.0",
-  "async-asgi-testclient >=1.4.8",
-  "nonebot2 >=2.3.0",
-  "pytest >=9.0.1"
+  "asgiref >=3.10.0, <4.0.0",
+  "async-asgi-testclient >=1.4.8, <2.0.0",
+  "nonebot2 >=2.3.0, <3.0.0",
+  "pytest >=9.0.1, <10.0.0"
 ]
 
 [project.urls]
@@ -28,14 +28,14 @@ nonebug = "nonebug.fixture"
 
 [dependency-groups]
 dev = [
-  "nonemoji >=0.1.4",
-  "pre-commit >=4.4.0",
-  "ruff >=0.14.5, <0.15.0",
+  "nonemoji >=0.1.4, <1.0.0",
+  "pre-commit >=4.5.0, <5.0.0",
+  "ruff >=0.14.6, <0.15.0",
 ]
 test = [
-  "nonebot2[fastapi] >=2.3.0",
-  "pytest-asyncio >=1.3.0",
-  "pytest-cov >=7.0.0"
+  "nonebot2[fastapi] >=2.3.0, <3.0.0",
+  "pytest-asyncio >=1.3.0, <2.0.0",
+  "pytest-cov >=7.0.0, <8.0.0"
 ]
 
 [build-system]
@@ -64,24 +64,24 @@ pythonVersion = "3.10"
 pythonPlatform = "All"
 executionEnvironments = [
   { root = "./tests", extraPaths = [
-    "./src",
+    "./",
   ] },
-  { root = "./src" },
+  { root = "./" },
 ]
 
 [tool.pytest]
 addopts = [
-  "--cov", "nonebug",
-  "--cov-report", "term-missing",
-  "-p", "no:nonebug",
+  "--cov",
+  "nonebug",
+  "--cov-report",
+  "term-missing",
+  "-p",
+  "no:nonebug",
 ]
-minversion = "9.0"
-pythonpath = ["src"]
 asyncio_mode = "auto"
 
 [tool.ruff]
 line-length = 88
-target-version = "py310"
 
 [tool.ruff.format]
 line-ending = "lf"
@@ -109,8 +109,6 @@ ignore = [
   "RUF001",  # ambiguous-unicode-character-string
   "RUF002",  # ambiguous-unicode-character-docstring
   "RUF003",  # ambiguous-unicode-character-comment
-  "W191",  # indentation contains tabs
-  "I001",  # isort: imports are incorrectly sorted
 ]
 
 [tool.ruff.lint.isort]
@@ -128,3 +126,7 @@ keep-runtime-typing = true
 [tool.uv]
 required-version = ">=0.9.0"
 default-groups = ["test", "dev"]
+
+[tool.uv.build-backend]
+module-name = "nonebug"
+module-root = ""
diff --git a/tests/test_call_api.py b/tests/test_call_api.py
@@ -1,5 +1,5 @@
-import pytest
 from utils import make_fake_event
+import pytest
 from nonebot import get_bot, get_bots
 from nonebot.adapters import Bot, Adapter
 
diff --git a/tests/test_dependent.py b/tests/test_dependent.py
@@ -1,9 +1,9 @@
-import pytest
 from utils import make_fake_event
-from nonebot.adapters import Event
+import pytest
+from exceptiongroup import BaseExceptionGroup
 from nonebot.params import EventParam
+from nonebot.adapters import Event
 from nonebot.exception import TypeMisMatch
-from exceptiongroup import BaseExceptionGroup
 
 from nonebug import App
 
diff --git a/tests/test_driver.py b/tests/test_driver.py
@@ -1,7 +1,7 @@
 import pytest
 import nonebot
-from nonebot.adapters import Bot, Event, Adapter, Message, MessageSegment
 from nonebot.drivers import URL, Driver, Request, Response, HTTPServerSetup
+from nonebot.adapters import Bot, Event, Adapter, Message, MessageSegment
 
 from nonebug import App
 
diff --git a/tests/test_process.py b/tests/test_process.py
@@ -1,5 +1,5 @@
-import pytest
 from utils import make_fake_event, make_fake_message
+import pytest
 
 from nonebug import App
 
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"name": "Default Linux Universal",`
`3`	`3`	`"image": "mcr.microsoft.com/devcontainers/universal:2-linux",`
`4`	`4`	`"features": {`
`5`		`- "ghcr.io/devcontainers-contrib/features/poetry:2": {}`
	`5`	`+ "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}`
`6`	`6`	`},`
`7`		`- "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install && poetry run pre-commit install",`
	`7`	`+ "postCreateCommand": "uv sync && uv run pre-commit install",`
`8`	`8`	`"customizations": {`
`9`	`9`	`"vscode": {`
`10`	`10`	`"settings": {`
`@@ -49,4 +49,4 @@`
`49`	`49`	`]`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`