summary refs log tree commit diff
path: root/jenkins
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-27 01:56:58 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-27 01:56:58 +0100
commit31c8be956f9addc801808f9b22108326287f7143 (patch)
treeff0785d0da08c1526f2c83c03d149e53cdc1d578 /jenkins
parentjenkins build: make sure we have a recent setuptools (diff)
downloadsynapse-31c8be956f9addc801808f9b22108326287f7143.tar.xz
also upgrade pip when installing
Diffstat (limited to '')
-rwxr-xr-xjenkins/prepare_synapse.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh
index 219828fa7b..a30179f2aa 100755
--- a/jenkins/prepare_synapse.sh
+++ b/jenkins/prepare_synapse.sh
@@ -26,6 +26,10 @@ TOX_BIN=$TOX_DIR/py27/bin
 # 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