Fix Python Old-Deps CI step (#79)
* Fix the Python 3.5 old-deps build. (#9146) setuptools 51.0.0 dropped support for Python 3.5. * 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. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
# Prevent virtualenv from auto-updating pip to an incompatible version
|
||||
export VIRTUALENV_NO_DOWNLOAD=1
|
||||
|
||||
exec tox -e py35-old,combine
|
||||
|
||||
1
changelog.d/9146.misc
Normal file
1
changelog.d/9146.misc
Normal file
@@ -0,0 +1 @@
|
||||
Fix the Python 3.5 + old dependencies build in CI.
|
||||
1
changelog.d/9217.misc
Normal file
1
changelog.d/9217.misc
Normal file
@@ -0,0 +1 @@
|
||||
Fix the Python 3.5 old dependencies build.
|
||||
12
tox.ini
12
tox.ini
@@ -17,11 +17,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'
|
||||
|
||||
setenv =
|
||||
PYTHONDONTWRITEBYTECODE = no_byte_code
|
||||
@@ -77,10 +79,8 @@ skip_install=True
|
||||
deps =
|
||||
# Old automat version for Twisted
|
||||
Automat == 0.3.0
|
||||
|
||||
lxml
|
||||
coverage
|
||||
coverage-enable-subprocess
|
||||
{[base]deps}
|
||||
|
||||
commands =
|
||||
/usr/bin/find "{toxinidir}" -name '*.pyc' -delete
|
||||
@@ -134,6 +134,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
|
||||
|
||||
Reference in New Issue
Block a user