Skip to content

Commit dcd2ecb

Browse files
committed
Update poetry to 2.2.0
This is required to support PEP 735: dependency groups.
1 parent cd5e19a commit dcd2ecb

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/fix_lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
3232
with:
3333
install-project: "false"
34-
poetry-version: "2.1.1"
34+
poetry-version: "2.2.0"
3535

3636
- name: Run ruff check
3737
continue-on-error: true

.github/workflows/latest_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
5555
with:
5656
python-version: "3.x"
57-
poetry-version: "2.1.1"
57+
poetry-version: "2.2.0"
5858
extras: "all"
5959
# Dump installed versions for debugging.
6060
- run: poetry run pip list > before.txt

.github/workflows/tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
9696
with:
9797
python-version: "3.x"
98-
poetry-version: "2.1.1"
98+
poetry-version: "2.2.0"
9999
extras: "all"
100100
- run: poetry run scripts-dev/generate_sample_config.sh --check
101101
- run: poetry run scripts-dev/config-lint.sh
@@ -134,7 +134,7 @@ jobs:
134134
- name: Setup Poetry
135135
uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
136136
with:
137-
poetry-version: "2.1.1"
137+
poetry-version: "2.2.0"
138138
install-project: "false"
139139

140140
- name: Run ruff check
@@ -169,7 +169,7 @@ jobs:
169169
# https://github.com/matrix-org/synapse/pull/15376#issuecomment-1498983775
170170
# To make CI green, err towards caution and install the project.
171171
install-project: "true"
172-
poetry-version: "2.1.1"
172+
poetry-version: "2.2.0"
173173

174174
# Cribbed from
175175
# https://github.com/AustinScola/mypy-cache-github-action/blob/85ea4f2972abed39b33bd02c36e341b28ca59213/src/restore.ts#L10-L17
@@ -264,7 +264,7 @@ jobs:
264264
# Install like a normal project from source with all optional dependencies
265265
extras: all
266266
install-project: "true"
267-
poetry-version: "2.1.1"
267+
poetry-version: "2.2.0"
268268

269269
- name: Ensure `Cargo.lock` is up to date (no stray changes after install)
270270
# The `::error::` syntax is using GitHub Actions' error annotations, see
@@ -398,7 +398,7 @@ jobs:
398398
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
399399
with:
400400
python-version: ${{ matrix.job.python-version }}
401-
poetry-version: "2.1.1"
401+
poetry-version: "2.2.0"
402402
extras: ${{ matrix.job.extras }}
403403
- name: Await PostgreSQL
404404
if: ${{ matrix.job.postgres-version }}
@@ -502,7 +502,7 @@ jobs:
502502
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
503503
with:
504504
python-version: ${{ matrix.python-version }}
505-
poetry-version: "2.1.1"
505+
poetry-version: "2.2.0"
506506
extras: ${{ matrix.extras }}
507507
- run: poetry run trial --jobs=2 tests
508508
- name: Dump logs
@@ -597,7 +597,7 @@ jobs:
597597
- run: sudo apt-get -qq install xmlsec1 postgresql-client
598598
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
599599
with:
600-
poetry-version: "2.1.1"
600+
poetry-version: "2.2.0"
601601
extras: "postgres"
602602
- run: .ci/scripts/test_export_data_command.sh
603603
env:
@@ -651,7 +651,7 @@ jobs:
651651
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
652652
with:
653653
python-version: ${{ matrix.python-version }}
654-
poetry-version: "2.1.1"
654+
poetry-version: "2.2.0"
655655
extras: "postgres"
656656
- run: .ci/scripts/test_synapse_port_db.sh
657657
id: run_tester_script

.github/workflows/twisted_trunk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
python-version: "3.x"
5757
extras: "all"
58-
poetry-version: "2.1.1"
58+
poetry-version: "2.2.0"
5959
- run: |
6060
poetry remove twisted
6161
poetry add --extras tls git+https://github.com/twisted/twisted.git#${{ inputs.twisted_ref || 'trunk' }}
@@ -83,7 +83,7 @@ jobs:
8383
with:
8484
python-version: "3.x"
8585
extras: "all test"
86-
poetry-version: "2.1.1"
86+
poetry-version: "2.2.0"
8787
- run: |
8888
poetry remove twisted
8989
poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
@@ -192,7 +192,7 @@ jobs:
192192
run: |
193193
set -x
194194
DEBIAN_FRONTEND=noninteractive sudo apt-get install -yqq python3 pipx
195-
pipx install poetry==2.1.1
195+
pipx install poetry==2.2.0
196196
197197
poetry remove -n twisted
198198
poetry add -n --extras tls git+https://github.com/twisted/twisted.git#trunk

debian/build_virtualenv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEMP_VENV="$(mktemp -d)"
3535
python3 -m venv "$TEMP_VENV"
3636
source "$TEMP_VENV/bin/activate"
3737
pip install -U pip
38-
pip install poetry==2.1.1 poetry-plugin-export==1.9.0
38+
pip install poetry==2.2.0 poetry-plugin-export==1.9.0
3939
poetry export \
4040
--extras all \
4141
--extras test \

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
ARG DEBIAN_VERSION=trixie
2424
ARG PYTHON_VERSION=3.13
25-
ARG POETRY_VERSION=2.1.1
25+
ARG POETRY_VERSION=2.2.0
2626

2727
###
2828
### Stage 0: generate requirements.txt

0 commit comments

Comments
 (0)