summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-01-25 14:22:35 -0500
committerRichard van der Hoff <richard@matrix.org>2021-01-25 19:38:31 +0000
commit2547d9d4d73050b654fcd8c77bbe5430303c026b (patch)
treed4c855b8f14426106a5e4b3e860fb60109cea24c /tox.ini
parentMerge tag 'v1.26.0rc2' into social_login (diff)
downloadsynapse-2547d9d4d73050b654fcd8c77bbe5430303c026b.tar.xz
Fix Python 3.5 old deps build by using a compatible pip version. (#9217)
Co-authored-by: Dan Callahan <danc@element.io>

pip 21.0 stopped supporting Python 3.5.
Diffstat (limited to '')
-rw-r--r--tox.ini15
1 files changed, 7 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 801e6dea2c..0479186348 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,11 +18,13 @@ deps =
     # installed on that).
     #
     # anyway, make sure that we have a recent enough setuptools.
-    setuptools>=18.5
+    setuptools>=18.5 ; python_version >= '3.6'
+    setuptools>=18.5,<51.0.0 ; python_version < '3.6'
 
     # we also need a semi-recent version of pip, because old ones fail to
     # install the "enum34" dependency of cryptography.
-    pip>=10
+    pip>=10 ; python_version >= '3.6'
+    pip>=10,<21.0 ; python_version < '3.6'
 
 # directories/files we run the linters on
 lint_targets =
@@ -103,15 +105,10 @@ usedevelop=true
 [testenv:py35-old]
 skip_install=True
 deps =
-    # Ensure a version of setuptools that supports Python 3.5 is installed.
-    setuptools < 51.0.0
-
     # Old automat version for Twisted
     Automat == 0.3.0
-
     lxml
-    coverage
-    coverage-enable-subprocess==1.0
+    {[base]deps}
 
 commands =
     # Make all greater-thans equals so we test the oldest version of our direct
@@ -168,6 +165,8 @@ commands = {toxinidir}/scripts-dev/generate_sample_config --check
 skip_install = True
 deps =
     coverage
+    pip>=10 ; python_version >= '3.6'
+    pip>=10,<21.0 ; python_version < '3.6'
 commands=
     coverage combine
     coverage report