diff options
author | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
---|---|---|
committer | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
commit | a06dd1d6b5a36a473ad58c186cac61ba929dc154 (patch) | |
tree | 5a8d355e61b47803acbc8cfabf391b4059b29dcf /tox.ini | |
parent | Fix state endpoint to be faster (diff) | |
parent | Tweak changes. (diff) | |
download | synapse-travis/fosdem/hotfixes.tar.xz |
Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/hotfixes
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 5210e7b860..801e6dea2c 100644 --- a/tox.ini +++ b/tox.ini @@ -117,7 +117,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 -d"\n" pip install' + /bin/sh -c 'python -m synapse.python_dependencies | sed -e "s/>=/==/g" -e "/psycopg2/d" -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" | xargs -d"\n" pip install' # Install Synapse itself. This won't update any libraries. pip install -e ".[test]" |