Merge pull request #50 from taskiq-python/develop

fix: FastStream 0.5.0 compatibility

Author: Lancetnik

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: pyproject.toml
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache
         with:
           path: ${{ env.pythonLocation }}
@@ -39,7 +39,7 @@ jobs:
         run: python -m build
 
       - name: Publish
-        uses: pypa/gh-action-pypi-publish@v1.8.11
+        uses: pypa/gh-action-pypi-publish@v1.8.14
         with:
           password: ${{ secrets.PYPI_TOKEN }}
 

.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache
         with:
           path: ${{ env.pythonLocation }}

pyproject.toml

@@ -8,7 +8,7 @@ description = "FastStream - taskiq integration to schedule FastStream tasks"
 readme = "README.md"
 authors = [
     { name = "Taskiq team", email = "taskiq@no-reply.com" },
-    { name = "Pastukhov Nikita", email = "diementros@yandex.ru" },
+    { name = "Nikita Pastukhov", email = "nikita@pastukhov-dev.com" },
 ]
 
 keywords = ["taskiq", "tasks", "distributed", "async", "FastStream"]
@@ -43,7 +43,7 @@ dynamic = ["version"]
 
 dependencies = [
     "taskiq>=0.10.0,<1.0.0",
-    "faststream>=0.3.14,<0.5.0",
+    "faststream>=0.3.14,<0.6.0",
 ]
 
 [project.optional-dependencies]
@@ -71,14 +71,14 @@ test = [
     "taskiq-faststream[redis]",
 
     "coverage[toml]>=7.2.0,<8.0.0",
-    "pytest>=7.4.0,<8",
+    "pytest>=7.4.0,<9",
 ]
 
 dev = [
     "taskiq-faststream[test]",
 
-    "mypy>=1.8.0,<1.9.0",
-    "ruff==0.1.13",
+    "mypy>=1.8.0,<1.10.0",
+    "ruff==0.4.1",
     "pre-commit >=3.6.0,<4.0.0",
 ]
 

taskiq_faststream/__about__.py

@@ -1,2 +1,2 @@
 """FastStream - taskiq integration to schedule FastStream tasks."""
-__version__ = "0.1.7"
+__version__ = "0.1.8"

taskiq_faststream/broker.py

@@ -1,9 +1,9 @@
 import typing
 import warnings
+from typing import Any
 
 import anyio
 from faststream.app import FastStream
-from faststream.broker.core.asynchronous import BrokerAsyncUsecase
 from faststream.types import SendableMessage
 from taskiq import AsyncBroker, BrokerMessage
 from taskiq.acks import AckableMessage
@@ -31,7 +31,7 @@ class BrokerWrapper(AsyncBroker):
         task : Register FastStream scheduled task.
     """
 
-    def __init__(self, broker: BrokerAsyncUsecase[typing.Any, typing.Any]) -> None:
+    def __init__(self, broker: Any) -> None:
         super().__init__()
         self.serializer = PatchedSerializer()
         self.broker = broker
@@ -131,7 +131,7 @@ async def kick(self, message: BrokerMessage) -> None:
 
 
 async def _broker_publish(
-    broker: BrokerAsyncUsecase[typing.Any, typing.Any],
+    broker: Any,
     message: BrokerMessage,
 ) -> None:
     labels = message.labels

tests/testcase.py

@@ -4,7 +4,6 @@
 from unittest.mock import MagicMock
 
 import pytest
-from faststream.broker.core.asynchronous import BrokerAsyncUsecase
 from faststream.utils.functions import timeout_scope
 from taskiq import AsyncBroker, TaskiqScheduler
 from taskiq.cli.scheduler.args import SchedulerArgs
@@ -20,14 +19,14 @@ class SchedulerTestcase:
     subj_name: str
 
     @staticmethod
-    def build_taskiq_broker(broker: BrokerAsyncUsecase[Any, Any]) -> AsyncBroker:
+    def build_taskiq_broker(broker: Any) -> AsyncBroker:
         """Build Taskiq compatible object."""
         return BrokerWrapper(broker)
 
     async def test_task(
         self,
         subject: str,
-        broker: BrokerAsyncUsecase[Any, Any],
+        broker: Any,
         mock: MagicMock,
         event: asyncio.Event,
     ) -> None: