summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-04-09 11:29:50 +0100
committerGitHub <noreply@github.com>2019-04-09 11:29:50 +0100
commit4abf5aa81af68e5dc9ac4fc383f75504bbc8cf97 (patch)
tree5dd82c6296b8cbc4e239d94530494020a9c21a12
parentRemove unused server_tls_certificates functions (#5028) (diff)
downloadsynapse-4abf5aa81af68e5dc9ac4fc383f75504bbc8cf97.tar.xz
Bump psycopg requirement (#5032)
-rw-r--r--changelog.d/5032.bugfix1
-rw-r--r--synapse/python_dependencies.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/5032.bugfix b/changelog.d/5032.bugfix
new file mode 100644

index 0000000000..cd71180ce9 --- /dev/null +++ b/changelog.d/5032.bugfix
@@ -0,0 +1 @@ +Fix "cannot import name execute_batch" error with postgres. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index f71e21ff4d..62c1748665 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -74,7 +74,9 @@ REQUIREMENTS = [ CONDITIONAL_REQUIREMENTS = { "email.enable_notifs": ["Jinja2>=2.9", "bleach>=1.4.2"], "matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"], - "postgres": ["psycopg2>=2.6"], + + # we use execute_batch, which arrived in psycopg 2.7. + "postgres": ["psycopg2>=2.7"], # ConsentResource uses select_autoescape, which arrived in jinja 2.9 "resources.consent": ["Jinja2>=2.9"],