diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-21 15:58:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 15:58:01 +0100 |
| commit | bab3eddac46a0d7bdfccfc980eececbf8f60f721 (patch) | |
| tree | c0e41056239a3ce5185cab479f6c80dd990df2b4 /tox.ini | |
| parent | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati... (diff) | |
| download | synapse-bab3eddac46a0d7bdfccfc980eececbf8f60f721.tar.xz | |
Pin eliot to <1.8 on python 3.5.2 (#5218)
* Pin eliot to <1.8 on python 3.5.2 Fixes https://github.com/matrix-org/synapse/issues/5199 * Add support for 'markers' to python_dependencies * tell xargs not to strip quotes
Diffstat (limited to '')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini index d0e519ce46..543b232ae7 100644 --- a/tox.ini +++ b/tox.ini @@ -94,7 +94,7 @@ commands = # Make all greater-thans equals so we test the oldest version of our direct # dependencies, but make the pyopenssl 17.0, which can work against an # OpenSSL 1.1 compiled cryptography (as older ones don't compile on Travis). - /bin/sh -c 'python -m synapse.python_dependencies | sed -e "s/>=/==/g" -e "s/psycopg2==2.6//" -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" | xargs pip install' + /bin/sh -c 'python -m synapse.python_dependencies | sed -e "s/>=/==/g" -e "s/psycopg2==2.6//" -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" | xargs -d"\n" pip install' # Add this so that coverage will run on subprocesses /bin/sh -c 'echo "import coverage; coverage.process_startup()" > {envsitepackagesdir}/../sitecustomize.py' |