Skip to content

Commit ad63918

Browse files
authored
Merge pull request #108 from taskiq-python/develop
3.0.0 releae
2 parents 4842747 + 44d91fd commit ad63918

File tree

7 files changed

+36
-47
lines changed

7 files changed

+36
-47
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,14 @@ jobs:
1616
GITHUB_CONTEXT: ${{ toJson(github) }}
1717
run: echo "$GITHUB_CONTEXT"
1818

19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@v5
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: 3.13
25-
cache: "pip"
26-
cache-dependency-path: pyproject.toml
27-
28-
- uses: actions/cache@v4
29-
id: cache
30-
with:
31-
path: ${{ env.pythonLocation }}
32-
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish
3325

3426
- name: Install build dependencies
35-
if: steps.cache.outputs.cache-hit != 'true'
3627
run: pip install build
3728

3829
- name: Build distribution
@@ -41,7 +32,6 @@ jobs:
4132
- name: Publish
4233
uses: pypa/gh-action-pypi-publish@release/v1
4334
with:
44-
password: ${{ secrets.PYPI_TOKEN }}
4535
skip-existing: true
4636

4737
- name: Dump GitHub context

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
if: github.event.pull_request.draft == false
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
19-
- uses: actions/setup-python@v5
18+
- uses: actions/checkout@v5
19+
- uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.13
2222

2323
- uses: astral-sh/setup-uv@v6
2424
with:
2525
version: "latest"
2626
- name: Install Dependencies
27-
run: uv pip install --system ".[dev]"
27+
run: uv pip install --system --group dev .
2828

2929
- name: Run formatter
3030
shell: bash
@@ -41,21 +41,21 @@ jobs:
4141
runs-on: ubuntu-latest
4242
strategy:
4343
matrix:
44-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
44+
python-version: ["3.10", "3.11", "3.12", "3.13"]
4545
fail-fast: false
4646

4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v5
4949
- name: Set up Python
50-
uses: actions/setup-python@v5
50+
uses: actions/setup-python@v6
5151
with:
5252
python-version: ${{ matrix.python-version }}
5353

5454
- uses: astral-sh/setup-uv@v6
5555
with:
5656
version: "latest"
5757
- name: Install Dependencies
58-
run: uv pip install --system ".[test]"
58+
run: uv pip install --system --group test .
5959

6060
- run: mkdir coverage
6161
- name: Test
@@ -76,9 +76,9 @@ jobs:
7676
runs-on: ubuntu-latest
7777

7878
steps:
79-
- uses: actions/checkout@v4
79+
- uses: actions/checkout@v5
8080

81-
- uses: actions/setup-python@v5
81+
- uses: actions/setup-python@v6
8282
with:
8383
python-version: 3.13
8484

@@ -87,7 +87,7 @@ jobs:
8787
version: "latest"
8888

8989
- name: Get coverage files
90-
uses: actions/download-artifact@v4
90+
uses: actions/download-artifact@v5
9191
with:
9292
pattern: .coverage*
9393
path: coverage

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ python -m pip install --upgrade pip
3131
After activating the virtual environment as described above, run:
3232

3333
```bash
34-
pip install -e ".[dev]"
34+
pip install --group dev -e .
3535
```
3636

3737
This will install all the dependencies and your local project in your virtual environment.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ pip install taskiq-faststream[rabbit]
3939
# or
4040
pip install taskiq-faststream[kafka]
4141
# or
42+
pip install taskiq-faststream[confluent]
43+
# or
4244
pip install taskiq-faststream[nats]
4345
# or
4446
pip install taskiq-faststream[redis]

pyproject.toml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "taskiq-faststream"
3-
version = "0.2.3"
3+
version = "0.3.0"
44
description = "FastStream - taskiq integration to schedule FastStream tasks"
55
readme = "README.md"
66
authors = [
@@ -10,19 +10,19 @@ authors = [
1010

1111
keywords = ["taskiq", "tasks", "distributed", "async", "FastStream"]
1212

13-
requires-python = ">=3.9"
13+
requires-python = ">=3.10"
1414

1515
classifiers = [
1616
"Development Status :: 5 - Production/Stable",
1717
"License :: OSI Approved :: MIT License",
1818
"Programming Language :: Python",
1919
"Programming Language :: Python :: 3",
2020
"Programming Language :: Python :: 3 :: Only",
21-
"Programming Language :: Python :: 3.9",
2221
"Programming Language :: Python :: 3.10",
2322
"Programming Language :: Python :: 3.11",
2423
"Programming Language :: Python :: 3.12",
2524
"Programming Language :: Python :: 3.13",
25+
"Programming Language :: Python :: 3.14",
2626
"Operating System :: OS Independent",
2727
"Topic :: Software Development :: Libraries :: Python Modules",
2828
"Topic :: Software Development :: Libraries",
@@ -63,7 +63,7 @@ redis = [
6363
"faststream[redis]"
6464
]
6565

66-
# local dev
66+
[dependency-groups]
6767
test = [
6868
"taskiq-faststream[nats]",
6969
"taskiq-faststream[rabbit]",
@@ -77,31 +77,24 @@ test = [
7777
]
7878

7979
dev = [
80-
"taskiq-faststream[test]",
81-
"mypy==1.16.0",
82-
"ruff==0.11.12",
80+
{include-group = "test"},
81+
"mypy==1.18.2",
82+
"ruff==0.13.2",
8383
"pre-commit >=3.6.0,<5.0.0",
8484
]
8585

86+
[build-system]
87+
requires = ["uv_build>=0.9.2"]
88+
build-backend = "uv_build"
89+
90+
[tool.uv.build-backend]
91+
module-root = ""
92+
8693
[project.urls]
8794
Homepage = "https://github.com/taskiq-python/taskiq-faststream"
8895
Tracker = "https://github.com/taskiq-python/taskiq-faststream/issues"
8996
Source = "https://github.com/taskiq-python/taskiq-faststream"
9097

91-
[tool.hatch.metadata]
92-
allow-direct-references = true
93-
allow-ambiguous-features = true
94-
95-
[tool.hatch.version]
96-
path = "taskiq_faststream/__about__.py"
97-
98-
[tool.hatch.build]
99-
skip-excluded-dirs = true
100-
exclude = [
101-
"/tests",
102-
"/.github",
103-
]
104-
10598
[tool.mypy]
10699
python_version = "3.9"
107100
strict = true

taskiq_faststream/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
from fast_depends.utils import is_async_gen_callable, is_gen_callable
44
from faststream.types import SendableMessage
5-
from faststream.utils.functions import to_async
5+
6+
try:
7+
from faststream.utils.functions import to_async
8+
except ImportError:
9+
from faststream._internal.utils import to_async # type: ignore[no-redef]
610

711

812
async def resolve_msg(

tests/testcase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from typing import Any
55
from unittest.mock import MagicMock
66

7+
import anyio
78
import pytest
89
from faststream.types import SendableMessage
9-
from faststream.utils.functions import timeout_scope
1010
from freezegun import freeze_time
1111
from taskiq import AsyncBroker
1212
from taskiq.cli.scheduler.args import SchedulerArgs
@@ -66,7 +66,7 @@ async def handler(msg: str) -> None:
6666
),
6767
)
6868

69-
with timeout_scope(3.0, True):
69+
with anyio.fail_after(3.0):
7070
await event.wait()
7171

7272
mock.assert_called_once_with("Hi!")

0 commit comments

Comments
 (0)