mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-07 15:11:56 +00:00
Merge pull request #9769 from matrix-org/rav/fix_bionic
Fix incompatibility with bionic
This commit is contained in:
commit
88b9414e32
@ -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
|
||||
|
1
changelog.d/9769.misc
Normal file
1
changelog.d/9769.misc
Normal file
@ -0,0 +1 @@
|
||||
Fix incompatibility with `tox` 2.5.
|
22
tox.ini
22
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=
|
||||
|
Loading…
Reference in New Issue
Block a user