summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-25 14:10:31 +0100
committerErik Johnston <erik@matrix.org>2015-08-25 14:10:31 +0100
commit8b52fe48b5f222bb444c93307c9681028693db2b (patch)
treea3f504042c5d4871247b300933d4ecb57eb2f704 /synapse/python_dependencies.py
parentRemove dependency on matrix-angular-sdk (diff)
downloadsynapse-8b52fe48b5f222bb444c93307c9681028693db2b.tar.xz
Revert previous commit. Instead, always download matrix-angular-sdk as a requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 61a362bb18..82e28133e2 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -34,13 +34,17 @@ REQUIREMENTS = {
     "blist": ["blist"],
     "pysaml2": ["saml2"],
 }
-CONDITIONAL_REQUIREMENTS = {}
+CONDITIONAL_REQUIREMENTS = {
+    "web_client": {
+        "matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"],
+    }
+}
 
 
 def requirements(config=None, include_conditional=False):
     reqs = REQUIREMENTS.copy()
-    for key, req in CONDITIONAL_REQUIREMENTS.items():
-        if (config and getattr(config, key)) or include_conditional:
+    if include_conditional:
+        for _, req in CONDITIONAL_REQUIREMENTS.items():
             reqs.update(req)
     return reqs