summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-18 15:06:16 +0100
committerErik Johnston <erik@matrix.org>2016-08-18 15:06:16 +0100
commit90b8b7706f0e7326075b197ef9f7ee75d0ec0602 (patch)
treed825983de515d405e56c50a3dca7c253080b6cde
parentMerge pull request #1025 from matrix-org/erikj/appservice_stream (diff)
downloadsynapse-90b8b7706f0e7326075b197ef9f7ee75d0ec0602.tar.xz
Jenkins: tox install setuptools
-rwxr-xr-xjenkins/prepare_synapse.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh
index 237223c81b..6c26c5842c 100755
--- a/jenkins/prepare_synapse.sh
+++ b/jenkins/prepare_synapse.sh
@@ -14,6 +14,7 @@ fi
 tox -e py27 --notest -v
 
 TOX_BIN=$TOX_DIR/py27/bin
+$TOX_BIN/pip install setuptools
 python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install
 $TOX_BIN/pip install lxml
 $TOX_BIN/pip install psycopg2