diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-01-25 08:51:45 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-01-25 08:51:45 -0500 |
| commit | e448dbbf5b488be28a9bf6d86ebd90fa2eee5e39 (patch) | |
| tree | 3a5c6994277a1a7d897f0cf626f2c63418e8b04d /tox.ini | |
| parent | Handle missing content keys when calculating presentable names. (#9165) (diff) | |
| parent | Tweak changes. (diff) | |
| download | synapse-e448dbbf5b488be28a9bf6d86ebd90fa2eee5e39.tar.xz | |
Merge tag 'v1.26.0rc2' into develop
Synapse 1.26.0rc2 (2021-01-25) ============================== Bugfixes -------- - Fix receipts and account data not being sent down sync. Introduced in v1.26.0rc1. ([\#9193](https://github.com/matrix-org/synapse/issues/9193), [\#9195](https://github.com/matrix-org/synapse/issues/9195)) - Fix chain cover update to handle events with duplicate auth events. Introduced in v1.26.0rc1. ([\#9210](https://github.com/matrix-org/synapse/issues/9210)) Internal Changes ---------------- - Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration. ([\#9189](https://github.com/matrix-org/synapse/issues/9189)) - Bump minimum `psycopg2` version to v2.8. ([\#9204](https://github.com/matrix-org/synapse/issues/9204))
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 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]" |