From a8c5bff080d3f871be1c85e0846eb97398bb5399 Mon Sep 17 00:00:00 2001 From: Nikita Pastukhov Date: Sat, 3 May 2025 18:45:38 +0300 Subject: [PATCH 1/3] chore: fix releases --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 4 ++-- pyproject.toml | 6 +----- taskiq_faststream/__about__.py | 4 +++- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5dfd5d4..f2c9ddc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,12 +21,12 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: 3.13 cache: "pip" cache-dependency-path: pyproject.toml - uses: actions/cache@v4 - id: cache + id: cachex2 with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish @@ -41,7 +41,7 @@ jobs: - name: Publish uses: pypa/gh-action-pypi-publish@v1.9.0 with: - password: ${{ secrets.PYPI_TOKEN }} + skip-existing: true - name: Dump GitHub context env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8328bd4..fe94673 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - uses: actions/cache@v4 id: cache @@ -94,7 +94,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - uses: astral-sh/setup-uv@v6 with: diff --git a/pyproject.toml b/pyproject.toml index 69998c2..5cb62d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,6 @@ -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - [project] name = "taskiq-faststream" +version = "0.2.1" description = "FastStream - taskiq integration to schedule FastStream tasks" readme = "README.md" authors = [ @@ -39,7 +36,6 @@ classifiers = [ "Framework :: Pydantic :: 2", ] -dynamic = ["version"] dependencies = [ "taskiq>=0.11.0,<0.12.0", diff --git a/taskiq_faststream/__about__.py b/taskiq_faststream/__about__.py index db42d9c..fc667c7 100644 --- a/taskiq_faststream/__about__.py +++ b/taskiq_faststream/__about__.py @@ -1,3 +1,5 @@ """FastStream - taskiq integration to schedule FastStream tasks.""" -__version__ = "0.2.1" +from importlib.metadata import version + +__version__ = version("taskiq_faststream") From 20019594fa2d05377da86f54529659aa23844cd4 Mon Sep 17 00:00:00 2001 From: Nikita Pastukhov Date: Sat, 3 May 2025 18:47:41 +0300 Subject: [PATCH 2/3] chore: fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f2c9ddc..76f8591 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: cache-dependency-path: pyproject.toml - uses: actions/cache@v4 - id: cachex2 + id: cache with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish From ba38197f0ee888a6e8e3eff2a9814c2f7bab743c Mon Sep 17 00:00:00 2001 From: Nikita Pastukhov Date: Sat, 3 May 2025 18:50:39 +0300 Subject: [PATCH 3/3] chore: remove cache from CI --- .github/workflows/test.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe94673..9570e8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,17 +20,10 @@ jobs: with: python-version: 3.13 - - uses: actions/cache@v4 - id: cache - with: - path: ${{ env.pythonLocation }} - key: ${{ runner.os }}-static-analysis-${{ hashFiles('pyproject.toml') }}-test-v03 - uses: astral-sh/setup-uv@v6 - if: steps.cache.outputs.cache-hit != 'true' with: version: "latest" - name: Install Dependencies - if: steps.cache.outputs.cache-hit != 'true' run: uv pip install --system ".[dev]" - name: Run formatter @@ -58,17 +51,10 @@ jobs: with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v4 - id: cache - with: - path: ${{ env.pythonLocation }} - key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test-v03 - uses: astral-sh/setup-uv@v6 - if: steps.cache.outputs.cache-hit != 'true' with: version: "latest" - name: Install Dependencies - if: steps.cache.outputs.cache-hit != 'true' run: uv pip install --system ".[test]" - run: mkdir coverage