From 69a4f213df1c6fefbe57b0eb5b4b712c303dad96 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 2 Mar 2020 15:24:02 +0000 Subject: [PATCH 1/2] Fix py35-old CI by using native tox. I'm not really sure how this was going wrong, but this seems like the right approach anyway. --- .buildkite/scripts/test_old_deps.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh index dfd71b251123..cdb77b556ca6 100755 --- a/.buildkite/scripts/test_old_deps.sh +++ b/.buildkite/scripts/test_old_deps.sh @@ -6,12 +6,7 @@ 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>=34.4.0' - -python3.5 -m pip install tox +apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev tox export LANG="C.UTF-8" From 47e175f13ffa84f4ea4abf179bbc8de22c2a0324 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 2 Mar 2020 15:34:02 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/7018.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7018.bugfix diff --git a/changelog.d/7018.bugfix b/changelog.d/7018.bugfix new file mode 100644 index 000000000000..d1b6c1d464cc --- /dev/null +++ b/changelog.d/7018.bugfix @@ -0,0 +1 @@ +Fix py35-old CI by using native tox package.