Skip to content

Commit b06a001

Browse files
Update Poetry and requests (#1377)
* Update Poetry and requests * Hold back PyYAML to avoid Cython errors This fixes an issue on newer Python installs that don't have distutils handy, as well as address a dependabot PR that could not merge correctly (#1284). Also, hold back PyYAML to avoid Cython-related issues (fixed in PyYAML 6, but Shrub requires PyYAML 5)
1 parent 2dc7efb commit b06a001

File tree

3 files changed

+27
-38
lines changed

3 files changed

+27
-38
lines changed

poetry.lock

Lines changed: 20 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ shrub-py = "3.0.4"
3131
yamlordereddictloader = "^0.4.0"
3232
types-docutils = "^0.20.0.1"
3333

34+
# XXX: These dependencies are only to force certain versions of transitive requirements,
35+
# but are not required otherwise.
36+
[tool.poetry.group.ext.dependencies]
37+
pyyaml = "<5.4"
38+
3439
[build-system]
3540
requires = ["poetry-core"]
3641
build-backend = "poetry.core.masonry.api"

tools/poetry.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
# • The default full path to the Poetry that will be installed and run by
2727
# this script (not present until after ensure-poetry or run-poetry is
2828
# executed).
29-
# * WANT_POETRY_VERSION (overridable) (default 1.4.2)
29+
# * WANT_POETRY_VERSION (overridable) (default 1.5.1)
3030
# • The version of Poetry that will be installed by run-poetry when executed.
3131

3232
# Load vars and utils:
3333
. "$(dirname "${BASH_SOURCE[0]}")/use.sh" python paths base with_lock download
3434

35-
: "${WANT_POETRY_VERSION:=1.4.2}"
35+
: "${WANT_POETRY_VERSION:=1.5.1}"
3636
declare -r -x POETRY_HOME=${FORCE_POETRY_HOME:-"$BUILD_CACHE_DIR/poetry-$WANT_POETRY_VERSION"}
3737
declare -r POETRY_EXE=$POETRY_HOME/bin/poetry$EXE_SUFFIX
3838

0 commit comments

Comments
 (0)