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 /synapse/python_dependencies.py | |
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 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c97e0df1f5..bfd46a3730 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -86,8 +86,8 @@ REQUIREMENTS = [ CONDITIONAL_REQUIREMENTS = { "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], - # we use execute_batch, which arrived in psycopg 2.7. - "postgres": ["psycopg2>=2.7"], + # we use execute_values with the fetch param, which arrived in psycopg 2.8. + "postgres": ["psycopg2>=2.8"], # ACME support is required to provision TLS certificates from authorities # that use the protocol, such as Let's Encrypt. "acme": [ |