diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
commit | c96d882a02924a26f69c75cb988b06f3015d7578 (patch) | |
tree | 4b2fd1bea90831955841dfb33753ac553c439104 /synapse/python_dependencies.py | |
parent | Merge branch 'develop' into matthew/filter_members (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-c96d882a02924a26f69c75cb988b06f3015d7578.tar.xz |
Merge branch 'develop' into matthew/filter_members
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 478c497722..faf6dfdb8d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -50,14 +50,16 @@ REQUIREMENTS = { "bcrypt": ["bcrypt>=3.1.0"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], - "blist": ["blist"], + "sortedcontainers": ["sortedcontainers"], "pysaml2>=3.0.0": ["saml2>=3.0.0"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], "six": ["six"], "prometheus_client": ["prometheus_client"], + "attr": ["attr"], } + CONDITIONAL_REQUIREMENTS = { "web_client": { "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], |