diff options
| author | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
|---|---|---|
| committer | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
| commit | fe18882bb5759133b8921b74d29d4a1906a69655 (patch) | |
| tree | bfb3ff30c09f50e0e8458eaff698d8509bf23496 /tox.ini | |
| parent | Merge branch 'develop' into jaywink/admin-forward-extremities (diff) | |
| parent | Merge tag 'v1.26.0rc2' into develop (diff) | |
| download | synapse-fe18882bb5759133b8921b74d29d4a1906a69655.tar.xz | |
Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extremities
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 1a3489344f..95841e03f0 100644 --- a/tox.ini +++ b/tox.ini @@ -118,7 +118,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]" |