summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-04-03 11:25:42 +0100
committerRichard van der Hoff <richard@matrix.org>2020-04-03 11:25:42 +0100
commitcb40b0cb80d54850682cbe014dd93efc0a43ccaa (patch)
tree46c3fe1e145343c9ac5b179983ab04e1694bd98e /synapse/python_dependencies.py
parentRevert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_log... (diff)
parentFix changelog wording (diff)
downloadsynapse-cb40b0cb80d54850682cbe014dd93efc0a43ccaa.tar.xz
Merge tag 'v1.12.2'
Synapse 1.12.2 (2020-04-02)
===========================

This release fixes [an
issue](https://github.com/matrix-org/synapse/issues/7208) with building the
debian packages.

No other significant changes since 1.12.1.
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 8de8cb2c12..3274eb9863 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -61,7 +61,9 @@ REQUIREMENTS = [
     "pyasn1-modules>=0.0.7",
     "daemonize>=2.3.1",
     "bcrypt>=3.1.0",
-    "pillow>=4.3.0",
+    # Pillow 7.1.0 causes the following issue on debian buster:
+    # https://github.com/python-pillow/Pillow/issues/2377
+    "pillow>=4.3.0,<7.1.0",
     "sortedcontainers>=1.4.4",
     "pymacaroons>=0.13.0",
     "msgpack>=0.5.2",