Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 2547d9d

Browse files
clokeprichvdh
authored andcommitted
Fix Python 3.5 old deps build by using a compatible pip version. (#9217)
Co-authored-by: Dan Callahan <[email protected]> pip 21.0 stopped supporting Python 3.5.
1 parent 65fb3b2 commit 2547d9d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.buildkite/scripts/test_old_deps.sh

+3
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev x
1010

1111
export LANG="C.UTF-8"
1212

13+
# Prevent virtualenv from auto-updating pip to an incompatible version
14+
export VIRTUALENV_NO_DOWNLOAD=1
15+
1316
exec tox -e py35-old,combine

changelog.d/9217.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix the Python 3.5 old dependencies build.

tox.ini

+7-8
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ deps =
1818
# installed on that).
1919
#
2020
# anyway, make sure that we have a recent enough setuptools.
21-
setuptools>=18.5
21+
setuptools>=18.5 ; python_version >= '3.6'
22+
setuptools>=18.5,<51.0.0 ; python_version < '3.6'
2223

2324
# we also need a semi-recent version of pip, because old ones fail to
2425
# install the "enum34" dependency of cryptography.
25-
pip>=10
26+
pip>=10 ; python_version >= '3.6'
27+
pip>=10,<21.0 ; python_version < '3.6'
2628

2729
# directories/files we run the linters on
2830
lint_targets =
@@ -103,15 +105,10 @@ usedevelop=true
103105
[testenv:py35-old]
104106
skip_install=True
105107
deps =
106-
# Ensure a version of setuptools that supports Python 3.5 is installed.
107-
setuptools < 51.0.0
108-
109108
# Old automat version for Twisted
110109
Automat == 0.3.0
111-
112110
lxml
113-
coverage
114-
coverage-enable-subprocess==1.0
111+
{[base]deps}
115112

116113
commands =
117114
# 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
168165
skip_install = True
169166
deps =
170167
coverage
168+
pip>=10 ; python_version >= '3.6'
169+
pip>=10,<21.0 ; python_version < '3.6'
171170
commands=
172171
coverage combine
173172
coverage report

0 commit comments

Comments
 (0)