diff options
| author | David Robertson <davidr@element.io> | 2022-03-11 15:35:24 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-03-14 18:42:02 +0000 |
| commit | c5a7465a1a1db927bc49befa93c70e116d8185eb (patch) | |
| tree | a11c63c8b3f0be8aeb2cf1ab65dcefec9ec608a0 | |
| parent | lock? (diff) | |
| download | synapse-c5a7465a1a1db927bc49befa93c70e116d8185eb.tar.xz | |
sod off, baldrick
| -rwxr-xr-x | .ci/scripts/test_old_deps.sh | 3 | ||||
| -rw-r--r-- | pyproject.toml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.ci/scripts/test_old_deps.sh b/.ci/scripts/test_old_deps.sh index 154f2cffd4..989d030650 100755 --- a/.ci/scripts/test_old_deps.sh +++ b/.ci/scripts/test_old_deps.sh @@ -29,11 +29,14 @@ export VIRTUALENV_NO_DOWNLOAD=1 # - OpenSSL 1.1 compiled cryptography (as older ones don't compile on Travis). # - remove pygithub from dev dependencies, because this wants a higher version of # pynacl than our minimum and we're not using it here +# - remove systemd-python. This used to be omitted when running `python_dependencies.py` +# as a script; we preserve this behaviour here. sed -i-backup \ -e "s/[~>]=/==/g" \ -e "/psycopg2/d" \ -e 's/pyOpenSSL = "==16.0.0"/pyOpenSSL = "==17.0.0"/' \ -e '/pygithub/d' \ + -e '/systemd/d' \ pyproject.toml # There are almost certainly going to be dependency conflicts there, so I'm going to diff --git a/pyproject.toml b/pyproject.toml index cec172af1d..4ec7a45c9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -163,6 +163,7 @@ psycopg2cffi = { version = ">=2.8", markers = "platform_python_implementation == psycopg2cffi-compat = { version = "==1.1", markers = "platform_python_implementation == 'PyPy'", optional = true } pysaml2 = { version = ">=4.5.0", optional = true } authlib = { version = ">=0.14.0", optional = true } +# Note: systemd-python 231 appears to have been yanked from pypi systemd-python = { version = ">=231", optional = true } lxml = { version = ">=4.2.0", optional = true } sentry-sdk = { version = ">=0.7.2", optional = true } |