diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-04-08 18:26:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 18:26:51 +0100 |
| commit | 88b9414e321fd74aac38001934916e31f1d8d3d0 (patch) | |
| tree | 703c542666e01738a81d2268abb8b49286dd4982 | |
| parent | Merge branch 'erikj/fix_stalled_catchup' into develop (diff) | |
| parent | unpin olddeps build from py36 (diff) | |
| download | synapse-88b9414e321fd74aac38001934916e31f1d8d3d0.tar.xz | |
Merge pull request #9769 from matrix-org/rav/fix_bionic
Fix incompatibility with bionic
| -rwxr-xr-x | .buildkite/scripts/test_old_deps.sh | 6 | ||||
| -rw-r--r-- | changelog.d/9769.misc | 1 | ||||
| -rw-r--r-- | tox.ini | 22 |
3 files changed, 18 insertions, 11 deletions
diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh index 9fe5b696b0..3753f41a40 100755 --- a/.buildkite/scripts/test_old_deps.sh +++ b/.buildkite/scripts/test_old_deps.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash # this script is run by buildkite in a plain `xenial` container; it installs the -# minimal requirements for tox and hands over to the py35-old tox environment. +# minimal requirements for tox and hands over to the py3-old tox environment. set -ex apt-get update -apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev xmlsec1 zlib1g-dev tox +apt-get install -y python3 python3-dev python3-pip libxml2-dev libxslt-dev xmlsec1 zlib1g-dev tox export LANG="C.UTF-8" # Prevent virtualenv from auto-updating pip to an incompatible version export VIRTUALENV_NO_DOWNLOAD=1 -exec tox -e py35-old,combine +exec tox -e py3-old,combine diff --git a/changelog.d/9769.misc b/changelog.d/9769.misc new file mode 100644 index 0000000000..042a50615f --- /dev/null +++ b/changelog.d/9769.misc @@ -0,0 +1 @@ +Fix incompatibility with `tox` 2.5. diff --git a/tox.ini b/tox.ini index 9ff70fe312..b2bc6f23ef 100644 --- a/tox.ini +++ b/tox.ini @@ -74,7 +74,7 @@ commands = # we use "env" rather than putting a value in `setenv` so that it is not # inherited by other tox environments. # - # keep this in sync with the copy in `testenv:py35-old`. + # keep this in sync with the copy in `testenv:py3-old`. # /usr/bin/env COVERAGE_PROCESS_START={toxinidir}/.coveragerc "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:} @@ -103,8 +103,9 @@ usedevelop=true # A test suite for the oldest supported versions of Python libraries, to catch # any uses of APIs not available in them. -[testenv:py35-old] -skip_install=True +[testenv:py3-old] +skip_install = true +usedevelop = false deps = # Old automat version for Twisted Automat == 0.3.0 @@ -136,7 +137,8 @@ commands = python -m synmark {posargs:} [testenv:packaging] -skip_install=True +skip_install = true +usedevelop = false deps = check-manifest commands = @@ -154,7 +156,8 @@ extras = lint commands = isort -c --df --sp setup.cfg {[base]lint_targets} [testenv:check-newsfragment] -skip_install = True +skip_install = true +usedevelop = false deps = towncrier>=18.6.0rc1 commands = python -m towncrier.check --compare-with=origin/develop @@ -163,7 +166,8 @@ commands = commands = {toxinidir}/scripts-dev/generate_sample_config --check [testenv:combine] -skip_install = True +skip_install = true +usedevelop = false deps = coverage pip>=10 ; python_version >= '3.6' @@ -173,14 +177,16 @@ commands= coverage report [testenv:cov-erase] -skip_install = True +skip_install = true +usedevelop = false deps = coverage commands= coverage erase [testenv:cov-html] -skip_install = True +skip_install = true +usedevelop = false deps = coverage commands= |