diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-04-08 16:21:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-04-08 16:22:45 +0100 |
| commit | 5edd91caecbdb7b8fefaf016cb452eefe3f56772 (patch) | |
| tree | ffb9776fb831e90cd929095d9d063c81d415ae7a | |
| parent | Update mypy configuration: `no_implicit_optional = True` (#9742) (diff) | |
| download | synapse-5edd91caecbdb7b8fefaf016cb452eefe3f56772.tar.xz | |
Fix incompatibility with tox 2.5
Apparently on tox 2.5, `usedevelop` overrides `skip_install`, so we end up trying to install the full dependencies even for the `-old` environment.
| -rw-r--r-- | changelog.d/9769.misc | 1 | ||||
| -rw-r--r-- | tox.ini | 18 |
2 files changed, 13 insertions, 6 deletions
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..8224edaef9 100644 --- a/tox.ini +++ b/tox.ini @@ -104,7 +104,8 @@ 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 +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= |