diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-22 12:33:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 12:33:21 +0100 |
| commit | 911db96658ffd0fca79dbd19499813ca75f65518 (patch) | |
| tree | cc11cbf13e9f19f47b733bb029fcc19803a61b71 /synapse/python_dependencies.py | |
| parent | uh, Matrix is called Matrix these days... (diff) | |
| parent | Make psutil an explicit dependency (diff) | |
| download | synapse-911db96658ffd0fca79dbd19499813ca75f65518.tar.xz | |
Merge pull request #4073 from matrix-org/rav/require_psutil
Make psutil an explicit dependency
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f51184b50d..943876456b 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -53,6 +53,7 @@ REQUIREMENTS = { "pillow>=3.1.2": ["PIL"], "pydenticon>=0.2": ["pydenticon"], "sortedcontainers>=1.4.4": ["sortedcontainers"], + "psutil>=2.0.0": ["psutil>=2.0.0"], "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl>=0.9.3": ["pymacaroons"], "msgpack-python>=0.4.2": ["msgpack"], @@ -79,9 +80,6 @@ CONDITIONAL_REQUIREMENTS = { "matrix-synapse-ldap3": { "matrix-synapse-ldap3>=0.1": ["ldap_auth_provider"], }, - "psutil": { - "psutil>=2.0.0": ["psutil>=2.0.0"], - }, "postgres": { "psycopg2>=2.6": ["psycopg2"] } |