summary refs log tree commit diff
path: root/.buildkite
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-03-02 16:17:11 +0000
committerGitHub <noreply@github.com>2020-03-02 16:17:11 +0000
commit3ab8e9c2932476d18af94b6c60cc3613139148ec (patch)
tree6e4080760a4e0c9cbd79c162c2c5a371e40786bd /.buildkite
parentremove spurious changelog (diff)
downloadsynapse-3ab8e9c2932476d18af94b6c60cc3613139148ec.tar.xz
Fix py35-old CI by using native tox. (#7018)
I'm not really sure how this was going wrong, but this seems like the
right approach anyway.
Diffstat (limited to '.buildkite')
-rwxr-xr-x.buildkite/scripts/test_old_deps.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/.buildkite/scripts/test_old_deps.sh b/.buildkite/scripts/test_old_deps.sh
index dfd71b2511..cdb77b556c 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"