Skip to content

Commit 13f1cd9

Browse files
authored
Merge branch 'master' into master
2 parents 9e594a0 + 57029c3 commit 13f1cd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+6834
-5150
lines changed

.coveragerc

Lines changed: 0 additions & 8 deletions
This file was deleted.

.deepsource.toml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.drone.yml

Lines changed: 0 additions & 182 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,15 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v6
14-
- name: Setup Python 3.12
14+
- name: Setup Python 3.14
1515
uses: actions/setup-python@v6
1616
with:
17-
python-version: "3.12"
18-
- name: Cache virtualenv
19-
id: venv-cache
20-
uses: actions/cache@v5
21-
with:
22-
path: .venv
23-
key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-3.12
24-
restore-keys: |
25-
venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-
26-
venv-${{ runner.os }}-${{ github.job }}-
27-
venv-${{ runner.os }}-
28-
- name: Install Poetry
29-
run: python -m pip install poetry
30-
- name: Cache Poetry and pip
31-
uses: actions/cache@v5
32-
with:
33-
path: |
34-
~/.cache/pypoetry
35-
~/.cache/pip
36-
key: poetry-pip-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
37-
restore-keys: |
38-
poetry-pip-${{ runner.os }}-
39-
- name: Install Dependencies with Poetry
40-
run: poetry install --no-interaction --no-ansi
17+
python-version: "3.14"
18+
- uses: astral-sh/setup-uv@v5
19+
- name: Install Dependencies
20+
run: uv sync
4121
- name: Build Documentation
42-
run: |
43-
poetry run make -C docs html
22+
run: uv run make -C docs html
4423
- name: Install AWS CLI
4524
run: |
4625
sudo apt update

.github/workflows/publish.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Publish to PyPI
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
env:
8+
FORCE_COLOR: 1
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v6
15+
- uses: astral-sh/setup-uv@v5
16+
17+
- name: Set version from release tag
18+
run: uv version "${GITHUB_REF_NAME#v}"
19+
20+
- name: Build package
21+
run: uv build
22+
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: dist
26+
path: dist/
27+
28+
publish:
29+
runs-on: ubuntu-latest
30+
needs: build
31+
environment: pypi
32+
permissions:
33+
id-token: write
34+
steps:
35+
- uses: actions/download-artifact@v4
36+
with:
37+
name: dist
38+
path: dist/
39+
40+
- uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,33 @@ on:
99

1010

1111
jobs:
12-
pylama:
12+
ruff:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v6
16-
- name: Setup python3.10
16+
- name: Setup python3.14
1717
uses: actions/setup-python@v6
1818
with:
19-
python-version: "3.10"
20-
- name: Cache virtualenv
21-
id: venv-cache
22-
uses: actions/cache@v5
23-
with:
24-
path: .venv
25-
key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
26-
- run: python -m pip install poetry
27-
- run: poetry install
28-
- run: poetry run pylama
19+
python-version: "3.14"
20+
- uses: astral-sh/setup-uv@v5
21+
- run: uv sync
22+
- run: uv run ruff check
23+
env:
24+
FORCE_COLOR: 1
25+
- run: uv run ruff format --check
2926
env:
3027
FORCE_COLOR: 1
3128
mypy:
3229
runs-on: ubuntu-latest
3330
steps:
3431
- uses: actions/checkout@v6
35-
- name: Setup python3.10
32+
- name: Setup python3.14
3633
uses: actions/setup-python@v6
3734
with:
38-
python-version: "3.10"
39-
- name: Cache virtualenv
40-
id: venv-cache
41-
uses: actions/cache@v5
42-
with:
43-
path: .venv
44-
key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
45-
- run: python -m pip install poetry
46-
- run: poetry install
47-
- run: poetry run mypy
35+
python-version: "3.14"
36+
- uses: astral-sh/setup-uv@v5
37+
- run: uv sync
38+
- run: uv run mypy
4839
env:
4940
FORCE_COLOR: 1
5041

@@ -67,17 +58,11 @@ jobs:
6758
uses: actions/setup-python@v6
6859
with:
6960
python-version: "${{ matrix.python }}"
70-
- name: Cache virtualenv
71-
id: venv-cache
72-
uses: actions/cache@v5
73-
with:
74-
path: .venv
75-
key: venv-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ matrix.python }}
76-
- run: python -m pip install poetry
77-
- run: poetry install --with=uvloop
61+
- uses: astral-sh/setup-uv@v5
62+
- run: uv sync --group uvloop
7863
- name: pytest
7964
run: >-
80-
poetry run pytest \
65+
uv run pytest \
8166
-vv \
8267
--cov=aio_pika \
8368
--cov-report=term-missing \
@@ -86,7 +71,7 @@ jobs:
8671
tests
8772
env:
8873
FORCE_COLOR: 1
89-
- run: poetry run coveralls
74+
- run: uv run coveralls
9075
env:
9176
COVERALLS_PARALLEL: 'true'
9277
COVERALLS_SERVICE_NAME: github

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
9.6.0
2+
-----
3+
4+
* Fixed callback-based consumers not resuming after connection reconnection #588
5+
* Fixed queue iterators raising StopAsyncIteration on channel reconnection #540
6+
* Added `close_called` property to `AbstractConnection` and `Connection` to distinguish intentional vs. automatic connection closures
7+
* Migrated build tooling from Poetry to UV
8+
* Migrated linting from Pylama to Ruff
9+
* Improved logging: split `log.exception` calls into error-level message and debug-level traceback #693
10+
* Removed testcontainers dependency from tests
11+
112
9.5.5
213
-----
314

0 commit comments

Comments
 (0)