Merge remote-tracking branch 'origin/master' into 2.0.x

This commit is contained in:
Alex Zorin
2022-11-11 17:25:42 +11:00
28 changed files with 473 additions and 376 deletions
-12
View File
@@ -50,18 +50,6 @@ awscli = ">=1.22.76"
# as a dependency here to ensure a version of cython is pinned for extra
# stability.
cython = "*"
# poetry 1.2.0+ is required for it to pin pip, setuptools, and wheel. See
# https://github.com/python-poetry/poetry/issues/1584. This version is required
# here in addition to certbot/setup.py because otherwise the pre-release
# version of poetry will not be installed.
#
# Additionally, newer versions of poetry/poetry-core include package extras
# (e.g. "docker[ssh]") in its `poetry export` output which is valid for
# requirements files, but not constraints files. We are currently using that
# output as constraints so let's also pin back poetry and poetry-core until we
# have a better workaround.
poetry = "1.2.0a2"
poetry-core = "1.1.0a7"
# setuptools-rust is a build dependency of cryptography, and since we don't have
# a great way of pinning build dependencies, we simply list it here to ensure a
# working version. Note: if build dependencies of setuptools-rust break at some