2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5df7d51ab1..bdad75113d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.12.1"
+__version__ = "1.12.2"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when
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",
|