summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-02 18:03:59 +0100
committerErik Johnston <erik@matrix.org>2017-10-02 18:03:59 +0100
commitea87cb1ba5f0a2614043be6f4499cfe842b9b8eb (patch)
tree29a985e99ef07db2e2f0d3ec25651802d4ce6abd /synapse/python_dependencies.py
parentMove quit_with_error (diff)
downloadsynapse-ea87cb1ba5f0a2614043be6f4499cfe842b9b8eb.tar.xz
Make 'affinity' package optional
Diffstat (limited to '')
-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 630e92c90e..7052333c19 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -40,7 +40,6 @@ REQUIREMENTS = {
     "pymacaroons-pynacl": ["pymacaroons"],
     "msgpack-python>=0.3.0": ["msgpack"],
     "phonenumbers>=8.2.0": ["phonenumbers"],
-    "affinity": ["affinity"],
 }
 CONDITIONAL_REQUIREMENTS = {
     "web_client": {
@@ -59,6 +58,9 @@ CONDITIONAL_REQUIREMENTS = {
     "psutil": {
         "psutil>=2.0.0": ["psutil>=2.0.0"],
     },
+    "affinity": {
+        "affinity": ["affinity"],
+    },
 }