diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-31 15:41:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 15:41:55 +0000 |
| commit | 60f128a401dc33bf3752fc554febb1b69801376d (patch) | |
| tree | b6765a4538290cf354838dc9b11d51c9812d4270 | |
| parent | Remove fetching keys via the deprecated v1 kex method (#4120) (diff) | |
| parent | changelog (diff) | |
| download | synapse-60f128a401dc33bf3752fc554febb1b69801376d.tar.xz | |
Merge pull request #4124 from matrix-org/rav/fix_tox
Attempt to fix tox installs
| -rw-r--r-- | changelog.d/4124.misc | 1 | ||||
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 19 | ||||
| -rw-r--r-- | tox.ini | 14 |
3 files changed, 15 insertions, 19 deletions
diff --git a/changelog.d/4124.misc b/changelog.d/4124.misc new file mode 100644 index 0000000000..28f438b9b2 --- /dev/null +++ b/changelog.d/4124.misc @@ -0,0 +1 @@ +Fix `tox` failure on old systems diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh index d95ca846c4..016afb8baa 100755 --- a/jenkins/prepare_synapse.sh +++ b/jenkins/prepare_synapse.sh @@ -14,22 +14,3 @@ fi # set up the virtualenv tox -e py27 --notest -v - -TOX_BIN=$TOX_DIR/py27/bin - -# 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 -} | xargs $TOX_BIN/pip install diff --git a/tox.ini b/tox.ini index 9de5a5704a..920211bf50 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,20 @@ deps = # needed by some of the tests lxml + # cyptography 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. + setuptools>=18.5 + + # we also need a semi-recent version of pip, because old ones fail to + # install the "enum34" dependency of cryptography. + pip>=10 + setenv = PYTHONDONTWRITEBYTECODE = no_byte_code |