From b099ef07d622a3d45bce167b4bcd94ff03d0b51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Thu, 25 Jun 2020 17:45:35 +0100
Subject: [PATCH] Make tox actions work on Debian 10 (#7703)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 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>
---
changelog.d/7703.misc | 1 +
tox.ini | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
create mode 100644 changelog.d/7703.misc
diff --git a/changelog.d/7703.misc b/changelog.d/7703.misc
new file mode 100644
index 0000000000..6e89897e45
--- /dev/null
+++ b/changelog.d/7703.misc
@@ -0,0 +1 @@
+Make Tox actions work on Debian 10.
diff --git a/tox.ini b/tox.ini
index 463a34d137..812fbff200 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,6 @@
envlist = packaging, py35, py36, py37, py38, check_codestyle, check_isort
[base]
-basepython = python3.7
deps =
mock
python-subunit
@@ -120,11 +119,11 @@ commands =
[testenv:check_codestyle]
skip_install = True
-basepython = python3.6
deps =
flake8
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 =
python -m black --check --diff .
/bin/sh -c "flake8 synapse tests scripts scripts-dev synctl {env:PEP8SUFFIX:}"
@@ -140,7 +139,6 @@ skip_install = True
deps = towncrier>=18.6.0rc1
commands =
python -m towncrier.check --compare-with=origin/develop
-basepython = python3.6
[testenv:check-sampleconfig]
commands = {toxinidir}/scripts-dev/generate_sample_config --check
--
GitLab