diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
| commit | 03e634dad4cd1014f609ece9574df7a24f1ec254 (patch) | |
| tree | a9f4a53a03bb0205e616ce7cf741fdbd15d4fcf5 /synapse/python_dependencies.py | |
| parent | pep8 (diff) | |
| parent | Port register_new_matrix_user to Python 3 and add tests (#4085) (diff) | |
| download | synapse-03e634dad4cd1014f609ece9574df7a24f1ec254.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
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"] } |