diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-08 11:24:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 11:24:11 +0100 |
| commit | e7674eb759645b7989f0d79eb6598a1d9929efaa (patch) | |
| tree | c3189b92b1e502551a856dbd7631e373fd7f9e33 /synapse/python_dependencies.py | |
| parent | Merge pull request #991 from matrix-org/erikj/retry_make (diff) | |
| parent | Make psutil optional (diff) | |
| download | synapse-e7674eb759645b7989f0d79eb6598a1d9929efaa.tar.xz | |
Merge pull request #992 from matrix-org/erikj/psutil_conditional
Make psutil optional
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
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"], + }, } |