diff options
author | David Robertson <davidr@element.io> | 2022-03-10 16:06:53 +0000 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2022-03-14 18:42:00 +0000 |
commit | 964c9372576762b0eb56fb1bb7f52fc00e414225 (patch) | |
tree | bbd8039d6e6d053f1135ad69725a95615024e9c0 | |
parent | Try to fix olddeps (diff) | |
download | synapse-964c9372576762b0eb56fb1bb7f52fc00e414225.tar.xz |
WIP
-rwxr-xr-x | .ci/scripts/test_old_deps.sh | 17 | ||||
-rw-r--r-- | .github/workflows/tests.yml | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/.ci/scripts/test_old_deps.sh b/.ci/scripts/test_old_deps.sh index 458cb59c8c..0656ecaa5f 100755 --- a/.ci/scripts/test_old_deps.sh +++ b/.ci/scripts/test_old_deps.sh @@ -25,8 +25,17 @@ export VIRTUALENV_NO_DOWNLOAD=1 # 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 +# OpenSSL 1.1 compiled cryptography (as older ones don't compile on Travis). + +sed -i \ + -e "s/[~>]=/==/g" \ + -e "/psycopg2/d" \ + -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" \ + pyproject.toml + +python3 -m venv venv +# Can't install with -e. Error message: +# > A "pyproject.toml" file was found, but editable mode currently requires a setup.py based build. +venv/bin/pip install .[all] +venv/bin/trial -j 2 tests \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8cec99ddf2..574f5ad399 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -123,10 +123,10 @@ jobs: - uses: actions/checkout@v2 - name: Test with old deps uses: docker://ubuntu:focal # For old python and sqlite + # Note: focal seems to be using 3.8, but the oldest is 3.7? with: workdir: /github/workspace entrypoint: .ci/scripts/test_old_deps.sh - - run: trial --jobs=2 tests - name: Dump logs # Logs are most useful when the command fails, always include them. if: ${{ always() }} @@ -149,7 +149,7 @@ jobs: strategy: matrix: python-version: ["pypy-3.7"] - extras: [""] + extras: ["all"] steps: - uses: actions/checkout@v2 |