diff options
| author | David Robertson <davidr@element.io> | 2022-03-10 14:39:40 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-03-14 18:42:00 +0000 |
| commit | fbbd0d1d5c58f8f0ebdabd3a9e2104bada71a579 (patch) | |
| tree | f9f337730b9242e0b1addefebc8c9de317ac5a04 | |
| parent | TODO note (diff) | |
| download | synapse-fbbd0d1d5c58f8f0ebdabd3a9e2104bada71a579.tar.xz | |
Try to fix olddeps
| -rwxr-xr-x | .ci/scripts/test_old_deps.sh | 14 | ||||
| -rw-r--r-- | .github/workflows/tests.yml | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.ci/scripts/test_old_deps.sh b/.ci/scripts/test_old_deps.sh index b2859f7522..458cb59c8c 100755 --- a/.ci/scripts/test_old_deps.sh +++ b/.ci/scripts/test_old_deps.sh @@ -17,4 +17,16 @@ export LANG="C.UTF-8" # Prevent virtualenv from auto-updating pip to an incompatible version export VIRTUALENV_NO_DOWNLOAD=1 -exec tox -e py3-old +# I'd prefer to use something like this +# https://github.com/python-poetry/poetry/issues/3527 +# https://github.com/pypa/pip/issues/8085 +# rather than this sed script. But that's an Opinion. + +# patch the project definitions in-place +# replace all lower bounds with exact bounds +# delete all lines referring to psycopg2 --- so no postgres support + +# but make the pyopenssl 17.0, which can work against an + # # OpenSSL 1.1 compiled cryptography (as older ones don't compile on Travis). +sed -i -e "s/[~>]=/==/g" -e "/psycopg2/d" pyproject.toml +pip install -e .[all] \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9d98f9992..8cec99ddf2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -126,8 +126,7 @@ jobs: with: workdir: /github/workspace entrypoint: .ci/scripts/test_old_deps.sh - env: - TRIAL_FLAGS: "--jobs=2" + - run: trial --jobs=2 tests - name: Dump logs # Logs are most useful when the command fails, always include them. if: ${{ always() }} |