Switch to using uv for dependency management and update related project workflows and scripts

2026-04-08 16:37:47 +00:00 · 2026-01-02 01:09:57 +02:00 · 2026-01-02 01:09:57 +02:00 · 13fb7a43a7
commit 13fb7a43a7
parent 7201e82238
7 changed files with 3026 additions and 149 deletions
--- a/.github/workflows/pypi-release.yml
+++ b/.github/workflows/pypi-release.yml
@ -10,25 +10,22 @@ jobs:
    name: Build
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6

-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
        with:
-          python-version: "3.11"
+          python-version: "3.14"

-      - name: Install build dependencies
-        run: python -m pip install --upgrade build
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7

      - name: Resolve version
        id: package-version
        run: echo "value=$(echo ${{ github.ref }} | sed -e 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT

-      # - name: Bump version
-      #   run: hatch version ${{ steps.package-version.outputs.value }}
-
-      - name: Build source distribution
-        run: python -m build .
+      - name: Build distribution
+        run: uv build

      - name: Try install wheel
        run: |
@ -39,7 +36,7 @@ jobs:
          venv/bin/pip install ../dist/aiogram-*.whl
          venv/bin/python -c "import aiogram; print(aiogram.__version__)"
      - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: dist
          path: dist/*
@ -55,7 +52,7 @@ jobs:
      id-token: write
    steps:
      - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
        with:
          name: dist
          path: dist
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -58,18 +58,21 @@ jobs:
        uses: actions/setup-python@v5
        with:
          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true

      - name: Install project dependencies
        run: |
-          pip install -e .[dev,test,redis,mongo,proxy,i18n,fast,signature]
+          uv sync --all-extras --group dev --group test

      - name: Lint code
        run: |
-          ruff check --output-format=github aiogram examples
-          mypy aiogram
-          black --check --diff aiogram tests
+          uv run ruff check --output-format=github aiogram examples
+          uv run mypy aiogram
+          uv run black --check --diff aiogram tests

      - name: Setup redis
        if: ${{ env.IS_WINDOWS == 'false' }}
@ -91,10 +94,10 @@ jobs:
          flags="$flags --cov=aiogram --cov-config .coveragerc --cov-report=xml"
          [[ "$IS_WINDOWS" == "false" ]] && flags="$flags --redis redis://localhost:6379/0"
          [[ "$IS_UBUNTU" == "true" ]] && flags="$flags --mongo mongodb://mongo:mongo@localhost:27017"
-          pytest $flags
+          uv run pytest $flags

      - name: Upload coverage data
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          files: coverage.xml
@ -123,20 +126,23 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true

      - name: Install project dependencies
        run: |
-          pip install -e .[dev,test,redis,mongo,proxy,i18n,fast,signature]
+          uv sync --all-extras --group dev --group test

      - name: Run tests
        run: |
          flags=""
-          pytest $flags
+          uv run pytest $flags
--- a/54
+++ b/54
@ -28,8 +28,8 @@ clean:

 .PHONY: install
 install: clean
-	pip install -e ."[dev,test,docs]" -U --upgrade-strategy=eager
-	pre-commit install
+	uv sync --all-extras --group dev --group test
+	uv run pre-commit install

 # =================================================================================================
 # Code quality
@ -37,15 +37,15 @@ install: clean

 .PHONY: lint
 lint:
-	isort --check-only $(code_dir)
-	black --check --diff $(code_dir)
-	ruff check --show-fixes --preview $(package_dir) $(examples_dir)
-	mypy $(package_dir)
+	uv run isort --check-only $(code_dir)
+	uv run black --check --diff $(code_dir)
+	uv run ruff check --show-fixes --preview $(package_dir) $(examples_dir)
+	uv run mypy $(package_dir)

 .PHONY: reformat
 reformat:
-	black $(code_dir)
-	isort $(code_dir)
+	uv run black $(code_dir)
+	uv run isort $(code_dir)

 # =================================================================================================
 # Tests
@ -56,18 +56,18 @@ test-run-services:

 .PHONY: test
 test: test-run-services
-	pytest --cov=aiogram --cov-config .coveragerc tests/ --redis $(redis_connection) --mongo $(mongo_connection)
+	uv run pytest --cov=aiogram --cov-config .coveragerc tests/ --redis $(redis_connection) --mongo $(mongo_connection)

 .PHONY: test-coverage
 test-coverage: test-run-services
 	mkdir -p $(reports_dir)/tests/
-	pytest --cov=aiogram --cov-config .coveragerc --html=$(reports_dir)/tests/index.html tests/ --redis $(redis_connection) --mongo $(mongo_connection)
-	coverage html -d $(reports_dir)/coverage
+	uv run pytest --cov=aiogram --cov-config .coveragerc --html=$(reports_dir)/tests/index.html tests/ --redis $(redis_connection) --mongo $(mongo_connection)
+	uv run coverage html -d $(reports_dir)/coverage

 .PHONY: test-coverage-view
 test-coverage-view:
-	coverage html -d $(reports_dir)/coverage
-	python -c "import webbrowser; webbrowser.open('file://$(shell pwd)/reports/coverage/index.html')"
+	uv run coverage html -d $(reports_dir)/coverage
+	uv run python -c "import webbrowser; webbrowser.open('file://$(shell pwd)/reports/coverage/index.html')"

 # =================================================================================================
 # Docs
@ -79,12 +79,12 @@ locales_pot := _build/gettext
 docs_dir := docs

 docs-gettext:
-	hatch run docs:bash -c 'cd $(docs_dir) && make gettext'
-	hatch run docs:bash -c 'cd $(docs_dir) && sphinx-intl update -p $(locales_pot) $(addprefix -l , $(locales))'
+	uv run --extra docs bash -c 'cd $(docs_dir) && make gettext'
+	uv run --extra docs bash -c 'cd $(docs_dir) && sphinx-intl update -p $(locales_pot) $(addprefix -l , $(locales))'
 .PHONY: docs-gettext

 docs-serve:
-	hatch run docs:sphinx-autobuild --watch aiogram/ --watch CHANGES.rst --watch README.rst docs/ docs/_build/ $(OPTS)
+	uv run --extra docs sphinx-autobuild --watch aiogram/ --watch CHANGES.rst --watch README.rst docs/ docs/_build/ $(OPTS)
 .PHONY: docs-serve

 $(locale_targets): docs-serve-%:
@ -97,31 +97,31 @@ $(locale_targets): docs-serve-%:

 .PHONY: build
 build: clean
-	hatch build
+	uv build

 .PHONY: bump
 bump:
-	hatch version $(args)
-	python scripts/bump_versions.py
+	uv run python scripts/bump_version.py $(args)
+	uv run python scripts/bump_versions.py

 update-api:
-	butcher parse
-	butcher refresh
-	butcher apply all
+	uv run --extra cli butcher parse
+	uv run --extra cli butcher refresh
+	uv run --extra cli butcher apply all
 	@$(MAKE) bump

 .PHONY: towncrier-build
 towncrier-build:
-	hatch run docs:towncrier build --yes
+	uv run --extra docs towncrier build --yes

 .PHONY: towncrier-draft
 towncrier-draft:
-	hatch run docs:towncrier build --draft
+	uv run --extra docs towncrier build --draft

 .PHONY: towncrier-draft-github
 towncrier-draft-github:
 	mkdir -p dist
-	hatch run docs:towncrier build --draft | pandoc - -o dist/release.md
+	uv run --extra docs towncrier build --draft | pandoc - -o dist/release.md

 .PHONY: prepare-release
 prepare-release: bump towncrier-build
@ -129,5 +129,5 @@ prepare-release: bump towncrier-build
 .PHONY: release
 release:
 	git add .
-	git commit -m "Release $(shell poetry version -s)"
-	git tag v$(shell hatch version -s)
+	git commit -m "Release $(shell uv run python -c 'from aiogram import __version__; print(__version__)')"
+	git tag v$(shell uv run python -c 'from aiogram import __version__; print(__version__)')
--- a/aiogram/dispatcher/dispatcher.py
+++ b/aiogram/dispatcher/dispatcher.py
@ -679,6 +679,6 @@ class Dispatcher(Router):
                if sys.version_info >= (3, 11):
                    with asyncio.Runner(loop_factory=uvloop.new_event_loop) as runner:
                        return runner.run(coro)
-                else:
+                else:  # pragma: no cover
                    uvloop.install()
                    return asyncio.run(coro)
--- a/pyproject.toml
+++ b/pyproject.toml
@ -78,17 +78,6 @@ cli = [
 signature = [
    "cryptography>=46.0.0",
 ]
-test = [
-    "pytest==9.0.1",
-    "pytest-html==4.1.1",
-    "pytest-mock==3.15.1",
-    "pytest-mypy==1.0.1",
-    "pytest-cov==7.0.0",
-    "pytest-aiohttp==1.1.0",
-    "aresponses==3.0.0",
-    "pytz==2025.2",
-    "pycryptodomex==3.23.0",
-]
 docs = [
    "Sphinx~=8.0.2",
    "sphinx-intl~=2.2.0",
@ -102,6 +91,8 @@ docs = [
    "markdown-include~=0.8.1",
    "sphinxcontrib-towncrier~=0.4.0a0",
 ]
+
+[dependency-groups]
 dev = [
    "black~=25.9",
    "isort~=7.0",
@ -112,95 +103,23 @@ dev = [
    "packaging~=25.0",
    "motor-types==1.0.0b4",
 ]
+test = [
+    "pytest==9.0.1",
+    "pytest-html==4.1.1",
+    "pytest-mock==3.15.1",
+    "pytest-mypy==1.0.1",
+    "pytest-cov==7.0.0",
+    "pytest-aiohttp==1.1.0",
+    "aresponses==3.0.0",
+    "pytz==2025.2",
+    "pycryptodomex==3.23.0",
+]

 [project.urls]
 Homepage = "https://aiogram.dev/"
 Documentation = "https://docs.aiogram.dev/"
 Repository = "https://github.com/aiogram/aiogram/"

-[tool.hatch.envs.default]
-features = [
-    "dev",
-    "fast",
-    "redis",
-    "mongo",
-    "proxy",
-    "i18n",
-    "cli",
-]
-post-install-commands = [
-    "pre-commit install",
-]
-
-[tool.hatch.envs.default.scripts]
-reformat = [
-    "black aiogram tests examples",
-    "isort aiogram tests examples",
-]
-lint = "ruff check aiogram tests examples"
-
-[tool.hatch.envs.docs]
-features = [
-    "fast",
-    "redis",
-    "mongo",
-    "proxy",
-    "i18n",
-    "docs",
-    "cli",
-]
-[tool.hatch.envs.docs.scripts]
-serve = "sphinx-autobuild --watch aiogram/ --watch CHANGES.rst --watch README.rst docs/ docs/_build/ {args}"
-
-[tool.hatch.envs.dev]
-python = "3.12"
-features = [
-    "dev",
-    "fast",
-    "redis",
-    "mongo",
-    "proxy",
-    "i18n",
-    "test",
-    "cli",
-]
-
-[tool.hatch.envs.dev.scripts]
-update = [
-    "butcher parse",
-    "butcher refresh",
-    "butcher apply all",
-]
-
-[tool.hatch.envs.test]
-features = [
-    "fast",
-    "redis",
-    "mongo",
-    "proxy",
-    "i18n",
-    "test",
-    "cli",
-]
-
-[tool.hatch.envs.test.scripts]
-cov = [
-    "pytest --cov-config pyproject.toml --cov=aiogram --html=reports/py{matrix:python}/tests/index.html {args}",
-    "coverage html -d reports/py{matrix:python}/coverage",
-]
-cov-redis = [
-    "pytest --cov-config pyproject.toml --cov=aiogram --html=reports/py{matrix:python}/tests/index.html --redis {env:REDIS_DNS:'redis://localhost:6379'} {args}",
-    "coverage html -d reports/py{matrix:python}/coverage",
-]
-cov-mongo = [
-    "pytest --cov-config pyproject.toml --cov=aiogram --html=reports/py{matrix:python}/tests/index.html --mongo {env:MONGO_DNS:'mongodb://mongo:mongo@localhost:27017'} {args}",
-    "coverage html -d reports/py{matrix:python}/coverage",
-]
-view-cov = "google-chrome-stable reports/py{matrix:python}/coverage/index.html"
-
-[[tool.hatch.envs.test.matrix]]
-python = ["310", "311", "312", "313"]
-
 [tool.ruff]
 line-length = 99
 src = ["aiogram", "tests"]
@ -277,6 +196,8 @@ exclude_lines = [
    "if TYPE_CHECKING:",
    "@abstractmethod",
    "@overload",
+    "if sys.version_info",
+    "except ImportError:"
 ]

 [tool.mypy]
--- a/scripts/bump_version.py
+++ b/scripts/bump_version.py
@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""Version bumping script for aiogram (replaces hatch version)."""
+import re
+import sys
+from pathlib import Path
+
+
+def bump_version(part: str) -> str:
+    """Bump version in __meta__.py."""
+    meta_path = Path("aiogram/__meta__.py")
+    content = meta_path.read_text()
+
+    # Extract current version
+    version_match = re.search(r'__version__ = "(\d+)\.(\d+)\.(\d+)"', content)
+    if not version_match:
+        raise ValueError("Could not find version in __meta__.py")
+
+    major, minor, patch = map(int, version_match.groups())
+
+    # Bump appropriate part
+    if part == "major":
+        major += 1
+        minor = 0
+        patch = 0
+    elif part == "minor":
+        minor += 1
+        patch = 0
+    elif part == "patch":
+        patch += 1
+    elif part.startswith("to:"):
+        new_version = part.replace("to:", "")
+        content = re.sub(
+            r'__version__ = "\d+\.\d+\.\d+"', f'__version__ = "{new_version}"', content
+        )
+        meta_path.write_text(content)
+        return new_version
+    else:
+        raise ValueError(f"Unknown part: {part}. Use major, minor, patch, or to:X.Y.Z")
+
+    new_version = f"{major}.{minor}.{patch}"
+    content = re.sub(r'__version__ = "\d+\.\d+\.\d+"', f'__version__ = "{new_version}"', content)
+    meta_path.write_text(content)
+    return new_version
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: python scripts/bump_version.py [major|minor|patch|to:X.Y.Z]")
+        sys.exit(1)
+
+    new_version = bump_version(sys.argv[1])
+    print(f"Bumped version to {new_version}")
--- a/uv.lock
+++ b/uv.lock