summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-25 15:55:54 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-25 15:55:54 +0200
commitfe18882bb5759133b8921b74d29d4a1906a69655 (patch)
treebfb3ff30c09f50e0e8458eaff698d8509bf23496 /synapse/python_dependencies.py
parentMerge branch 'develop' into jaywink/admin-forward-extremities (diff)
parentMerge tag 'v1.26.0rc2' into develop (diff)
downloadsynapse-fe18882bb5759133b8921b74d29d4a1906a69655.tar.xz
Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
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": [