diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-26 13:05:30 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-26 13:11:03 +0100 |
| commit | dbf76fd4b9aa555ef9ab11455a9ed77014d991bd (patch) | |
| tree | 13b1f80f069ae3ba5a961f7550cb25ec65cd19d9 | |
| parent | Miscellaneous fixes to python_dependencies (diff) | |
| download | synapse-dbf76fd4b9aa555ef9ab11455a9ed77014d991bd.tar.xz | |
jenkins build: make sure we have a recent setuptools
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh index ffcb1cfab9..219828fa7b 100755 --- a/jenkins/prepare_synapse.sh +++ b/jenkins/prepare_synapse.sh @@ -1,5 +1,7 @@ #! /bin/bash +set -eux + cd "`dirname $0`/.." TOX_DIR=$WORKSPACE/.tox @@ -14,7 +16,16 @@ fi tox -e py27 --notest -v TOX_BIN=$TOX_DIR/py27/bin -$TOX_BIN/pip install setuptools + +# cryptography 2.2 requires setuptools >= 18.5. +# +# older versions of virtualenv (?) give us a virtualenv with the same version +# of setuptools as is installed on the system python (and tox runs virtualenv +# under python3, so we get the version of setuptools that is installed on that). +# +# anyway, make sure that we have a recent enough setuptools. +$TOX_BIN/pip install 'setuptools>=18.5' + { python synapse/python_dependencies.py echo lxml psycopg2 } | xargs $TOX_BIN/pip install |