Skip to content
Snippets Groups Projects
Commit 2547d9d4 authored by Patrick Cloke's avatar Patrick Cloke Committed by Richard van der Hoff
Browse files

Fix Python 3.5 old deps build by using a compatible pip version. (#9217)


Co-authored-by: default avatarDan Callahan <danc@element.io>

pip 21.0 stopped supporting Python 3.5.
parent 65fb3b2e
No related branches found
No related tags found
No related merge requests found
...@@ -10,4 +10,7 @@ apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev x ...@@ -10,4 +10,7 @@ apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev x
export LANG="C.UTF-8" 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 py35-old,combine
Fix the Python 3.5 old dependencies build.
...@@ -18,11 +18,13 @@ deps = ...@@ -18,11 +18,13 @@ deps =
# installed on that). # installed on that).
# #
# anyway, make sure that we have a recent enough setuptools. # 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 # we also need a semi-recent version of pip, because old ones fail to
# install the "enum34" dependency of cryptography. # 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 # directories/files we run the linters on
lint_targets = lint_targets =
...@@ -103,15 +105,10 @@ usedevelop=true ...@@ -103,15 +105,10 @@ usedevelop=true
[testenv:py35-old] [testenv:py35-old]
skip_install=True skip_install=True
deps = deps =
# Ensure a version of setuptools that supports Python 3.5 is installed.
setuptools < 51.0.0
# Old automat version for Twisted # Old automat version for Twisted
Automat == 0.3.0 Automat == 0.3.0
lxml lxml
coverage {[base]deps}
coverage-enable-subprocess==1.0
commands = commands =
# Make all greater-thans equals so we test the oldest version of our direct # 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 ...@@ -168,6 +165,8 @@ commands = {toxinidir}/scripts-dev/generate_sample_config --check
skip_install = True skip_install = True
deps = deps =
coverage coverage
pip>=10 ; python_version >= '3.6'
pip>=10,<21.0 ; python_version < '3.6'
commands= commands=
coverage combine coverage combine
coverage report coverage report
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment