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

This commit is contained in:
Erik Johnston 2016-08-18 15:06:31 +01:00
commit 19a625362b

View File

@ -14,6 +14,7 @@ fi
tox -e py27 --notest -v tox -e py27 --notest -v
TOX_BIN=$TOX_DIR/py27/bin TOX_BIN=$TOX_DIR/py27/bin
$TOX_BIN/pip install setuptools
python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install
$TOX_BIN/pip install lxml $TOX_BIN/pip install lxml
$TOX_BIN/pip install psycopg2 $TOX_BIN/pip install psycopg2