diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
| commit | 977765bde2987770f63065d839f9686a7a144140 (patch) | |
| tree | 41d3a247f546cfe50500f465e50a798a597ef464 /jenkins | |
| parent | remove user agent from data model, will just join on user_ips (diff) | |
| parent | Merge pull request #2846 from kaiyou/feat-dockerfile (diff) | |
| download | synapse-977765bde2987770f63065d839f9686a7a144140.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_analytics
Diffstat (limited to 'jenkins')
| -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 |