diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-12 16:41:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-06-12 16:41:08 +0100 |
| commit | e0c56d65270da579b8e006c32477f671922e3986 (patch) | |
| tree | c59c89e9c4c3509f37a33ec46625a847d3a3e75c /tox.ini | |
| parent | Move schema update to 54 and add a warning comment (diff) | |
| parent | Regenerate full schemas (diff) | |
| download | synapse-e0c56d65270da579b8e006c32477f671922e3986.tar.xz | |
Merge branch 'dinsic' into babolivier/fix_profile_replication
Diffstat (limited to 'tox.ini')
| -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' |