Merge pull request #28 from taskiq-python/develop

chore: add redis distribution, py3.12 support

Author: Lancetnik

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: Release python package
 
 on:
+  workflow_dispatch: null
   push:
     tags:
       - "*"
@@ -18,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.8"
           cache: "pip"
@@ -38,7 +39,7 @@ jobs:
         run: python -m build
 
       - name: Publish
-        uses: pypa/[email protected].10
+        uses: pypa/[email protected].11
         with:
           password: ${{ secrets.PYPI_TOKEN }}
 

.github/workflows/test.yml

@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install Dependencies and library
         shell: bash
         run: |
           set -ux
           python -m pip install --upgrade pip
           pip install -e ".[dev]"
 
-      - name: Run black
+      - name: Run formatter
         shell: bash
-        run: black taskiq_faststream
+        run: ruff format taskiq_faststream
 
       - name: Run mypy
         shell: bash
@@ -40,13 +40,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - uses: actions/cache@v3
@@ -61,13 +61,14 @@ jobs:
       - name: Test
         run: bash scripts/test.sh
         env:
-          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
-          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
+          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
       - name: Store coverage files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: .coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
           path: coverage
+          if-no-files-found: error
 
   coverage-combine:
     needs: [test]
@@ -76,15 +77,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
 
       - name: Get coverage files
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: coverage
+          pattern: .coverage*
           path: coverage
+          merge-multiple: true
 
       - run: pip install coverage[toml]
 
@@ -94,7 +96,7 @@ jobs:
       - run: coverage html --show-contexts --title "taskiq-faststream coverage for ${{ github.sha }}"
 
       - name: Store coverage html
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-html
           path: htmlcov

pyproject.toml

@@ -25,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Libraries",
@@ -42,7 +43,7 @@ dynamic = ["version"]
 
 dependencies = [
     "taskiq>=0.10.0,<1.0.0",
-    "faststream>=0.2.12,<1.0.0",
+    "faststream>=0.3.0,<1.0.0",
 ]
 
 [project.optional-dependencies]
@@ -58,25 +59,27 @@ kafka = [
     "faststream[kafka]"
 ]
 
+redis = [
+    "faststream[redis]"
+]
+
 # local dev
 test = [
     "taskiq-faststream[nats]",
     "taskiq-faststream[rabbit]",
     "taskiq-faststream[kafka]",
+    "taskiq-faststream[redis]",
 
     "coverage[toml]>=7.2.0,<8.0.0",
-    "pytest==7.4.3",
+    "pytest>=7.4.0,<8",
 ]
 
 dev = [
     "taskiq-faststream[test]",
 
-    "mypy==1.7.1",
-    "black==23.11.0",
-    "isort==5.12.0",
-    "ruff==0.1.6",
-    "pyupgrade-directories==0.3.0",
-    "pre-commit==3.5.0",
+    "mypy>=1.8.0,<1.9.0",
+    "ruff==0.1.11",
+    "pre-commit >=3.6.0,<4.0.0",
 ]
 
 [project.urls]
@@ -139,6 +142,8 @@ select = [
     "ISC", # Implicit string concat
     "PIE", # Unnecessary code
     "T20", # Catch prints
+    "UP",  # pyupgrade
+    "PERF",# perfomance checks
     "PYI", # validate pyi files
     "Q",   # Checks for quotes
     "RSE", # Checks raise statements
@@ -162,6 +167,8 @@ ignore = [
     "ANN401",  # typing.Any are disallowed in `**kwargs
     "PLR0913", # Too many arguments for function call
     "D106",    # Missing docstring in public nested class
+    "COM812",
+    "ISC001",
 ]
 exclude = [".venv/"]
 
@@ -211,8 +218,7 @@ omit = [
 [tool.coverage.report]
 show_missing = true
 skip_empty = true
-exclude_lines = [
-    ".*# pragma: no cover",
+exclude_also = [
     "if __name__ == .__main__.:",
     "self.logger",
     "def __repr__",

scripts/lint.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-echo "Running pyup_dirs..."
-pyup_dirs --py38-plus --recursive taskiq_faststream tests
-
 echo "Running ruff..."
 ruff taskiq_faststream tests --fix
 
-echo "Running black..."
-black taskiq_faststream tests
+echo "Running ruff formatter..."
+ruff format taskiq_faststream tests
 
 echo "Running mypy..."
 mypy taskiq_faststream

taskiq_faststream/__about__.py

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

tests/test_redis.py

@@ -0,0 +1,25 @@
+import pytest
+from faststream import FastStream
+from faststream.redis import RedisBroker, TestRedisBroker
+from taskiq import AsyncBroker
+
+from taskiq_faststream import AppWrapper
+
+from .testcase import SchedulerTestcase
+
+
+@pytest.fixture
+def broker() -> RedisBroker:
+    return RedisBroker()
+
+
+class TestBroker(SchedulerTestcase):
+    test_class = TestRedisBroker
+    subj_name = "channel"
+
+
+class TestApp(TestBroker):
+    @staticmethod
+    def build_taskiq_broker(broker: RedisBroker) -> AsyncBroker:
+        """Build AppWrapper."""
+        return AppWrapper(FastStream(broker))