diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-18 15:06:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-18 15:06:31 +0100 |
| commit | 19a625362b5edc8848e583dff3a306a3336191f3 (patch) | |
| tree | f5341a997aa4149ad12bf2317fd384e3171f3862 | |
| parent | Add appservice worker (diff) | |
| parent | Jenkins: tox install setuptools (diff) | |
| download | synapse-19a625362b5edc8848e583dff3a306a3336191f3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice_stream
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 1 |
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 |