Skip to content

Commit 947216a

Browse files
Update latest_deps workflow to migrate poetry --no-dev -> --without dev (#18617)
1 parent c5999cf commit 947216a

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

.github/workflows/latest_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- run: poetry run pip list > before.txt
6161
# Upgrade all runtime dependencies only. This is intended to mimic a fresh
6262
# `pip install matrix-synapse[all]` as closely as possible.
63-
- run: poetry update --no-dev
63+
- run: poetry update --without dev
6464
- run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true)
6565
- name: Remove unhelpful options from mypy config
6666
run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini

changelog.d/18617.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Unbreak "Latest dependencies" workflow by using the `--without dev` poetry option instead of removed `--no-dev`.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ pydantic = ">=1.7.4, <3"
224224
# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
225225
# `poetry build` do the right thing without this explicit dependency.
226226
#
227-
# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
227+
# This isn't really a dev-dependency, as `poetry install --without dev` will fail,
228228
# but the alternative is to add it to the main list of deps where it isn't
229229
# needed.
230230
setuptools_rust = ">=1.3"

synapse/util/check_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def _is_dev_dependency(req: Requirement) -> bool:
7474
def _should_ignore_runtime_requirement(req: Requirement) -> bool:
7575
# This is a build-time dependency. Irritatingly, `poetry build` ignores the
7676
# requirements listed in the [build-system] section of pyproject.toml, so in order
77-
# to support `poetry install --no-dev` we have to mark it as a runtime dependency.
77+
# to support `poetry install --without dev` we have to mark it as a runtime dependency.
7878
# See discussion on https://github.com/python-poetry/poetry/issues/6154 (it sounds
7979
# like the poetry authors don't consider this a bug?)
8080
#

0 commit comments

Comments
 (0)