summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-06 14:36:59 +0100
committerErik Johnston <erik@matrix.org>2021-05-06 14:36:59 +0100
commita8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40 (patch)
treef6606188f50cf4dace37ee5f3845443cbcff492e /synapse/python_dependencies.py
parentFollow-up to #9915 to correct the identifier for room types. (diff)
parent 1.33.1 (diff)
downloadsynapse-a8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index d58eeeaa74..2113c620c6 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -78,7 +78,8 @@ REQUIREMENTS = [
     # we use attr.validators.deep_iterable, which arrived in 19.1.0 (Note:
     # Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33
     # is out in November.)
-    "attrs>=19.1.0",
+    # Note: 21.1.0 broke `/sync`, see #9936
+    "attrs>=19.1.0,<21.1.0",
     "netaddr>=0.7.18",
     "Jinja2>=2.9",
     "bleach>=1.4.3",