diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-27 11:48:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 11:48:28 +0100 |
| commit | 268e40341b9d707cad435702bf613b1f31839ed2 (patch) | |
| tree | f7b941436f85a4c0683bad99ed5964194d32616e /jenkins/prepare_synapse.sh | |
| parent | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions (diff) | |
| parent | also upgrade pip when installing (diff) | |
| download | synapse-268e40341b9d707cad435702bf613b1f31839ed2.tar.xz | |
Merge pull request #3136 from matrix-org/rav/fix_dependencies
Miscellaneous fixes to python_dependencies
Diffstat (limited to 'jenkins/prepare_synapse.sh')
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh index ffcb1cfab9..a30179f2aa 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,20 @@ 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' + +# we also need a semi-recent version of pip, because old ones fail to install +# the "enum34" dependency of cryptography. +$TOX_BIN/pip install 'pip>=10' + { python synapse/python_dependencies.py echo lxml psycopg2 } | xargs $TOX_BIN/pip install |