summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-08 11:12:21 +0100
committerErik Johnston <erik@matrix.org>2016-08-08 11:12:21 +0100
commit7c1a92274c720f125e8c5bb96b85f05734a58943 (patch)
treec3189b92b1e502551a856dbd7631e373fd7f9e33 /synapse/python_dependencies.py
parentMerge pull request #991 from matrix-org/erikj/retry_make (diff)
downloadsynapse-7c1a92274c720f125e8c5bb96b85f05734a58943.tar.xz
Make psutil 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 799d35da5e..86e3d89154 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -36,7 +36,6 @@ REQUIREMENTS = {
     "blist": ["blist"],
     "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"],
     "pymacaroons-pynacl": ["pymacaroons"],
-    "psutil>=2.0.0": ["psutil>=2.0.0"],
 }
 CONDITIONAL_REQUIREMENTS = {
     "web_client": {
@@ -52,6 +51,9 @@ CONDITIONAL_REQUIREMENTS = {
     "ldap": {
         "ldap3>=1.0": ["ldap3>=1.0"],
     },
+    "psutil": {
+        "psutil>=2.0.0": ["psutil>=2.0.0"],
+    },
 }