Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice_stream

8 years ago · 19a625362b
parent 07229bbdae 90b8b7706f
commit 19a625362b
1 changed files with 1 additions and 0 deletions
--- 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