summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-04-12 13:29:57 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-04-12 13:29:57 +0100
commit0d2b7fdcec04d994a55f1fbbe53f848742c89e0a (patch)
tree58682de74f81bf3d1d85d31c40266583b775842a /synapse/python_dependencies.py
parentMerge pull request #2973 from matrix-org/matthew/dinsic_3pid_check (diff)
parentMerge pull request #3092 from matrix-org/rav/response_cache_metrics (diff)
downloadsynapse-0d2b7fdcec04d994a55f1fbbe53f848742c89e0a.tar.xz
Merge branch 'develop' into dinsic
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 91179ce532..f9596bddaf 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -34,9 +34,8 @@ REQUIREMENTS = { "bcrypt": ["bcrypt>=3.1.0"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], - "ujson": ["ujson"], - "blist": ["blist"], "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "sortedcontainers": ["sortedcontainers"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"],