diff options
author | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
---|---|---|
committer | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
commit | 54def42c19c51b102dbd9a77dfd2430944a94d79 (patch) | |
tree | da30431884421f42ab95e103bf66c7343d4cc4c4 /synapse/python_dependencies.py | |
parent | Fix terms UI auth test (diff) | |
parent | fix branch regexp (diff) | |
download | synapse-54def42c19c51b102dbd9a77dfd2430944a94d79.tar.xz |
Merge branch 'develop' into travis/login-terms
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"] } |