Merge branch 'develop' into dependabot/pip/pip-bb2a874772

Author: Lancetnik

.github/workflows/release.yml

@@ -22,17 +22,8 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: 3.13
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
-
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish
 
       - name: Install build dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
         run: pip install build
 
       - name: Build distribution
@@ -41,7 +32,6 @@ jobs:
       - name: Publish
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.PYPI_TOKEN }}
           skip-existing: true
 
       - name: Dump GitHub context

CONTRIBUTING.md

@@ -31,7 +31,7 @@ python -m pip install --upgrade pip
 After activating the virtual environment as described above, run:
 
 ```bash
-pip install -e ".[dev]"
+pip install --group dev -e .
 ```
 
 This will install all the dependencies and your local project in your virtual environment.

README.md

@@ -39,6 +39,8 @@ pip install taskiq-faststream[rabbit]
 # or
 pip install taskiq-faststream[kafka]
 # or
+pip install taskiq-faststream[confluent]
+# or
 pip install taskiq-faststream[nats]
 # or
 pip install taskiq-faststream[redis]

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskiq-faststream"
-version = "0.2.3"
+version = "0.3.0"
 description = "FastStream - taskiq integration to schedule FastStream tasks"
 readme = "README.md"
 authors = [
@@ -10,19 +10,19 @@ authors = [
 
 keywords = ["taskiq", "tasks", "distributed", "async", "FastStream"]
 
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Libraries",
@@ -63,7 +63,7 @@ redis = [
     "faststream[redis]"
 ]
 
-# local dev
+[dependency-groups]
 test = [
     "taskiq-faststream[nats]",
     "taskiq-faststream[rabbit]",
@@ -77,31 +77,24 @@ test = [
 ]
 
 dev = [
-    "taskiq-faststream[test]",
+    {include-group = "test"},
     "mypy==1.18.2",
     "ruff==0.13.2",
     "pre-commit >=3.6.0,<5.0.0",
 ]
 
+[build-system]
+requires = ["uv_build>=0.9.2"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-root = ""
+
 [project.urls]
 Homepage = "https://github.com/taskiq-python/taskiq-faststream"
 Tracker = "https://github.com/taskiq-python/taskiq-faststream/issues"
 Source = "https://github.com/taskiq-python/taskiq-faststream"
 
-[tool.hatch.metadata]
-allow-direct-references = true
-allow-ambiguous-features = true
-
-[tool.hatch.version]
-path = "taskiq_faststream/__about__.py"
-
-[tool.hatch.build]
-skip-excluded-dirs = true
-exclude = [
-    "/tests",
-    "/.github",
-]
-
 [tool.mypy]
 python_version = "3.9"
 strict = true

taskiq_faststream/utils.py

@@ -2,7 +2,11 @@
 
 from fast_depends.utils import is_async_gen_callable, is_gen_callable
 from faststream.types import SendableMessage
-from faststream.utils.functions import to_async
+
+try:
+    from faststream.utils.functions import to_async
+except ImportError:
+    from faststream._internal.utils import to_async  # type: ignore[no-redef]
 
 
 async def resolve_msg(

tests/testcase.py

@@ -4,9 +4,9 @@
 from typing import Any
 from unittest.mock import MagicMock
 
+import anyio
 import pytest
 from faststream.types import SendableMessage
-from faststream.utils.functions import timeout_scope
 from freezegun import freeze_time
 from taskiq import AsyncBroker
 from taskiq.cli.scheduler.args import SchedulerArgs
@@ -66,7 +66,7 @@ async def handler(msg: str) -> None:
                 ),
             )
 
-            with timeout_scope(3.0, True):
+            with anyio.fail_after(3.0):
                 await event.wait()
 
         mock.assert_called_once_with("Hi!")