From 5d48901d109c2eb07e67cb12ed4b43d194d8cb9d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sun, 9 Feb 2020 23:52:51 +0000 Subject: [PATCH 1/4] Update setuptools for python 3.5 tests --- changelog.d/6880.misc | 1 + tox.ini | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 changelog.d/6880.misc diff --git a/changelog.d/6880.misc b/changelog.d/6880.misc new file mode 100644 index 000000000000..8344a6ed1eed --- /dev/null +++ b/changelog.d/6880.misc @@ -0,0 +1 @@ +Fix continuous integration failures with old versions of `pip`, which were introduced by a release of the `zipp` library. diff --git a/tox.ini b/tox.ini index 88ef12bebd32..8760943cb26e 100644 --- a/tox.ini +++ b/tox.ini @@ -90,6 +90,10 @@ deps = coverage coverage-enable-subprocess + # workaround for https://github.com/jaraco/zipp/issues/40 + # I'm not sure if this is the best solution, but it will do for now. + setuptools == 34.4.0 + commands = /usr/bin/find "{toxinidir}" -name '*.pyc' -delete # Make all greater-thans equals so we test the oldest version of our direct From e303f9850b796b99629cfaeeaa04ad6e88bad752 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 10 Feb 2020 00:16:35 +0000 Subject: [PATCH 2/4] Add a script for buildkite to run for the py35 env Of course, it's installing tox that is failing, so upgrading setuptools from within `tox` doesn't help. We need to go earlier. The pipeline command is getting to complicated, so let's move the script in here. --- .buildkite/scripts/test_old_deps.sh | 16 ++++++++++++++++ tox.ini | 4 ---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100755 .buildkite/scripts/test_old_deps.sh diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh new file mode 100755 index 000000000000..eff2019a83e5 --- /dev/null +++ b/.buildkite/scripts/test_old_deps.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# this script is run by buildkite in a plain `xenial` container; it installs the +# minimal requirements for tox and hands over to the py35-old tox environment. + +set -ex + +apt-get update +apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev + +# workaround for https://github.com/jaraco/zipp/issues/40 +python3.5 -m pip install setuptools + +python3.5 -m pip install tox + +exec tox -e py35-old,combine diff --git a/tox.ini b/tox.ini index 8760943cb26e..88ef12bebd32 100644 --- a/tox.ini +++ b/tox.ini @@ -90,10 +90,6 @@ deps = coverage coverage-enable-subprocess - # workaround for https://github.com/jaraco/zipp/issues/40 - # I'm not sure if this is the best solution, but it will do for now. - setuptools == 34.4.0 - commands = /usr/bin/find "{toxinidir}" -name '*.pyc' -delete # Make all greater-thans equals so we test the oldest version of our direct From b32dd4673c56f2ef2580e5c7644173c5976a7ea5 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 10 Feb 2020 00:18:54 +0000 Subject: [PATCH 3/4] move the LANG setting in here too This is currently an outlier among the other buildkite cases, so let's simplify the buildkite pipeline further. --- .buildkite/scripts/test_old_deps.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh index eff2019a83e5..dfcff031a441 100755 --- a/.buildkite/scripts/test_old_deps.sh +++ b/.buildkite/scripts/test_old_deps.sh @@ -13,4 +13,6 @@ python3.5 -m pip install setuptools python3.5 -m pip install tox +export LANG="C.UTF-8" + exec tox -e py35-old,combine From cad94a8905c598980c94fe8b720a98958a4d8504 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 10 Feb 2020 00:26:57 +0000 Subject: [PATCH 4/4] gah, need a version --- .buildkite/scripts/test_old_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh index dfcff031a441..dfd71b251123 100755 --- a/.buildkite/scripts/test_old_deps.sh +++ b/.buildkite/scripts/test_old_deps.sh @@ -9,7 +9,7 @@ apt-get update apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev # workaround for https://github.com/jaraco/zipp/issues/40 -python3.5 -m pip install setuptools +python3.5 -m pip install 'setuptools>=34.4.0' python3.5 -m pip install tox