summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-09-25 11:16:42 +0100
committerGitHub <noreply@github.com>2018-09-25 11:16:42 +0100
commite4e96486a907eb51853a196ea997f242088bb5d9 (patch)
tree55652495d26efaa70c4656a62715947174695e26
parentOnly lazy load self-members on initial sync (diff)
parentchangelog (diff)
downloadsynapse-e4e96486a907eb51853a196ea997f242088bb5d9.tar.xz
Merge pull request #3947 from matrix-org/rav/attr_version
We require attrs 16.0.0
-rw-r--r--changelog.d/3947.misc1
-rw-r--r--synapse/python_dependencies.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/3947.misc b/changelog.d/3947.misc
new file mode 100644
index 0000000000..5a9a22bed9
--- /dev/null
+++ b/changelog.d/3947.misc
@@ -0,0 +1 @@
+Require attrs 16.0.0 or later
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 0d8de600cf..c779f69fa0 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -58,7 +58,9 @@ REQUIREMENTS = {
     "phonenumbers>=8.2.0": ["phonenumbers"],
     "six": ["six"],
     "prometheus_client": ["prometheus_client"],
-    "attrs": ["attr"],
+
+    # we use attr.s(slots), which arrived in 16.0.0
+    "attrs>=16.0.0": ["attr>=16.0.0"],
     "netaddr>=0.7.18": ["netaddr"],
 }