Make tox actions work on Debian 10 (#7703)

- Remove the requirement for a specific version of Python
- Move dep comment to a separate line, Tox 3.7.0 like trailing ones

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
This commit is contained in:
Dagfinn Ilmari Mannsåker 2020-06-25 17:45:35 +01:00 committed by GitHub
parent 0e0a2817a2
commit b099ef07d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

1
changelog.d/7703.misc Normal file
View File

@ -0,0 +1 @@
Make Tox actions work on Debian 10.

View File

@ -2,7 +2,6 @@
envlist = packaging, py35, py36, py37, py38, check_codestyle, check_isort envlist = packaging, py35, py36, py37, py38, check_codestyle, check_isort
[base] [base]
basepython = python3.7
deps = deps =
mock mock
python-subunit python-subunit
@ -120,11 +119,11 @@ commands =
[testenv:check_codestyle] [testenv:check_codestyle]
skip_install = True skip_install = True
basepython = python3.6
deps = deps =
flake8 flake8
flake8-comprehensions flake8-comprehensions
black==19.10b0 # We pin so that our tests don't start failing on new releases of black. # We pin so that our tests don't start failing on new releases of black.
black==19.10b0
commands = commands =
python -m black --check --diff . python -m black --check --diff .
/bin/sh -c "flake8 synapse tests scripts scripts-dev synctl {env:PEP8SUFFIX:}" /bin/sh -c "flake8 synapse tests scripts scripts-dev synctl {env:PEP8SUFFIX:}"
@ -140,7 +139,6 @@ skip_install = True
deps = towncrier>=18.6.0rc1 deps = towncrier>=18.6.0rc1
commands = commands =
python -m towncrier.check --compare-with=origin/develop python -m towncrier.check --compare-with=origin/develop
basepython = python3.6
[testenv:check-sampleconfig] [testenv:check-sampleconfig]
commands = {toxinidir}/scripts-dev/generate_sample_config --check commands = {toxinidir}/scripts-dev/generate_sample_config --check