summary refs log tree commit diff
path: root/.buildkite
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-03-02 16:55:55 +0000
committerErik Johnston <erik@matrix.org>2020-03-02 16:55:55 +0000
commit65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch)
tree442d9e11867521f021b3cb05531af9c446d7c4ef /.buildkite
parentFix worker handling (diff)
parentAlways return a deferred from `get_current_state_deltas`. (#7019) (diff)
downloadsynapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
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"