feat: support for python 3.14

Author: klen

.github/workflows/release.yml

@@ -12,9 +12,11 @@ jobs:
     if: github.event.workflow_run.conclusion == 'success'
     steps:
       - uses: actions/checkout@main
-      - name: Install poetry
-        run: pipx install poetry
-      - name: Setup poetry
-        run: poetry config pypi-token.pypi ${{ secrets.pypy }}
-      - name: Build and publish
-        run: poetry publish --build
+      - uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Build Package
+        run: |
+          uv build
+          uv publish --token ${{ secrets.pypy }}

.github/workflows/tests.yml

@@ -15,27 +15,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@main
-      - name: install poetry
-        run: pip install poetry
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@main
+      - uses: astral-sh/setup-uv@v7
         with:
-          cache: poetry
+          enable-cache: true
           python-version: ${{ matrix.python-version }}
 
-      - name: Setup requirements
-        run: poetry install --with dev
+      - name: Setup dependencies
+        run: uv sync --locked --all-extras --dev
 
       - name: Check code
-        run: poetry run ruff check muffin
+        run: uv run ruff check muffin
 
       - name: Check typing
-        run: poetry run mypy
+        run: uv run mypy
 
       - name: Test with pytest
-        run: poetry run pytest tests
+        run: uv run pytest tests

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         stages: ["commit-msg"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-case-conflict
         stages: ["pre-commit"]
@@ -39,42 +39,39 @@ repos:
         stages: ["pre-commit"]
 
   - repo: https://github.com/psf/black
-    rev: 25.1.0
+    rev: 25.9.0
     hooks:
       - id: black
         stages: ["pre-commit"]
 
-  - repo: https://github.com/python-poetry/poetry
-    rev: "2.1.3"
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.9.7
     hooks:
-      - id: poetry-check
-        files: ^(.*/)?pyproject\.toml$
-        stages: ["pre-commit"]
-      - id: poetry-lock
-        files: ^(.*/)?(poetry\.lock|pyproject\.toml)$
+      - id: uv-lock
+        args: ["--check"]
         stages: ["pre-commit"]
 
   - repo: local
     hooks:
       - id: ruff
         name: ruff
-        entry: poetry run ruff check muffin
+        entry: uv run ruff check muffin
         language: system
         pass_filenames: false
         files: \.py$
         stages: ["pre-commit"]
 
       - id: mypy
         name: mypy
-        entry: poetry run mypy
+        entry: uv run mypy
         language: system
         pass_filenames: false
         files: \.py$
         stages: ["pre-push"]
 
       - id: pytest
         name: pytest
-        entry: poetry run pytest tests
+        entry: uv run pytest tests
         language: system
         pass_filenames: false
         files: \.py$

Makefile

@@ -7,30 +7,31 @@ all: $(VIRTUAL_ENV)
 #  Development
 # =============
 
-$(VIRTUAL_ENV): pyproject.toml .pre-commit-config.yaml .git-commits.yaml
-	@poetry install --with dev -E standard
-	@poetry run pre-commit install
-	@touch $(VIRTUAL_ENV)
+$(VIRTUAL_ENV): uv.lock .pre-commit-config.yaml
+	@echo "Setting up virtual environment and installing dependencies..."
+	@uv sync --all-groups
+	@GIT_CONFIG=/dev/null && uv run pre-commit install
+	@touch $(VIRTUAL_ENV) # Create a marker file
 
 .PHONY: t test
 # target: test - Run tests
 t test: $(VIRTUAL_ENV)
-	@poetry run pytest -xsvl --mypy tests
+	@uv run pytest -xsvl --mypy tests
 
 .PHONY: lint
 # target: mypy - Run typechecking
 lint: $(VIRTUAL_ENV)
-	@poetry run ruff muffin
-	@poetry run mypy
+	@uv run ruff muffin
+	@uv run mypy
 
 .PHONY: mypy
 # target: mypy - Run typechecking
 mypy: $(VIRTUAL_ENV)
-	@poetry run mypy
+	@uv run mypy
 
 .PHONY: docs
 docs: $(VIRTUAL_ENV)
-	@poetry run sphinx-build docs/ docs/_build -b html
+	@uv run sphinx-build docs/ docs/_build -b html
 	# @$(VIRTUAL_ENV)/bin/python setup.py upload_sphinx --upload-dir=docs/_build/html
 
 
@@ -55,12 +56,14 @@ release: $(VIRTUAL_ENV)
 	@git checkout master
 	@git pull
 	@git merge develop
-	@poetry version $(VERSION)
-	@git commit -am "build(release): `poetry version -s`"
-	@git tag `poetry version -s`
+	@uvx bump-my-version bump $(VERSION)
+	@uv lock
+	@git commit -am "build(release): `uv version --short`"
+	@git tag `uv version --short`
 	@git checkout develop
 	@git merge master
 	@git push --tags origin develop master
+	@echo "Release process complete for `uv version --short`."
 
 .PHONY: minor
 minor: release
@@ -75,4 +78,4 @@ major:
 
 .PHONY: version v
 version v:
-	@poetry version -s
+	@uv version --short

muffin/app.py

@@ -13,6 +13,7 @@
 from modconfig import Config
 
 from muffin.constants import CONFIG_ENV_VARIABLE
+from muffin.manage import Manager
 from muffin.utils import import_submodules, logger
 
 if TYPE_CHECKING:
@@ -70,7 +71,6 @@ def __init__(self, *cfg_mods: str | ModuleType, **options):
         self.cfg.update_from_env(prefix=f"{ self.cfg.name }_")
 
         # Setup CLI
-        from muffin.manage import Manager
 
         self.manage = Manager(self)
 

muffin/handler.py

@@ -21,7 +21,7 @@ class HandlerMeta(type):
 
     def __new__(mcs: type[HandlerMeta], name: str, bases: tuple[type], params: dict[str, Any]):
         """Prepare a Handler Class."""
-        cls = cast(type["Handler"], super().__new__(mcs, name, bases, params))
+        cls = cast("type[Handler]", super().__new__(mcs, name, bases, params))
 
         # Ensure that the class methods are exist and iterable
         if not cls.methods:

muffin/manage.py

@@ -98,7 +98,7 @@ def shell(*, ipython: bool = True):
             banner += f"Loaded globals: {list(ctx.keys())}\n"
             if ipython:
                 with suppress(ImportError):
-                    from IPython.terminal.embed import InteractiveShellEmbed
+                    from IPython.terminal.embed import InteractiveShellEmbed  # noqa: PLC0415
 
                     sh = InteractiveShellEmbed.instance(banner1=banner, user_ns=ctx)
                     return sh()
@@ -109,15 +109,10 @@ def shell(*, ipython: bool = True):
 
         def run(host: str = "localhost", port: int = 5000):
             """Run the application with the given host and port."""
-            from uvicorn.main import run as urun
+            from uvicorn.main import run as urun  # noqa: PLC0415
 
             cfg = self.app.cfg
-            return urun(
-                self.app,
-                host=host,
-                port=port,
-                log_config=cfg.LOG_CONFIG,
-            )
+            return urun(self.app, host=host, port=port, log_config=cfg.LOG_CONFIG)
 
         self(run)
 

muffin/plugins.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from abc import ABC
-from asyncio import iscoroutinefunction
+from inspect import iscoroutinefunction
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, ClassVar, Mapping
 
 from modconfig import Config

muffin/pytest.py

@@ -10,6 +10,9 @@
 import pytest
 from asgi_tools.tests import ASGITestClient, manage_lifespan
 
+from muffin.constants import CONFIG_ENV_VARIABLE
+from muffin.utils import import_app
+
 if TYPE_CHECKING:
     from muffin.app import Application
 
@@ -33,7 +36,6 @@ def pytest_addoption(parser):
 
 def pytest_load_initial_conftests(early_config, parser, args):
     """Prepare to loading Muffin application."""
-    from muffin.constants import CONFIG_ENV_VARIABLE
 
     options = parser.parse_known_args(args)
 
@@ -51,14 +53,12 @@ def pytest_load_initial_conftests(early_config, parser, args):
 async def app(pytestconfig, request, aiolib):  # noqa: ARG001
     """Load an application, run lifespan events, prepare plugins."""
     if not pytestconfig.app:
-        logging.warning(
+        logging.warning(  # noqa: LOG015
             "Improperly configured. Please set ``muffin_app`` in your pytest config. "
             "Or use ``--muffin-app`` command option.",
         )
         return
 
-    from muffin.utils import import_app
-
     muffin_app = import_app(pytestconfig.app)
     msg = f"Setup application '{muffin_app.cfg.name}'"
     if muffin_app.cfg.config:
@@ -89,7 +89,7 @@ async def lifecycle(app: Application):
             yield app
 
 
-@pytest.fixture()
+@pytest.fixture
 def client(app):
     """Generate a test client for the app."""
     return ASGITestClient(app)