summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-13 11:27:29 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-13 11:27:29 +0100
commitf56db48f67a9c1fb5f90e9e99481402c27bb365a (patch)
treeeea617f2c326751c7dfd9bfac68636ef12aefc1f /synapse/python_dependencies.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentRevert "Use sortedcontainers instead of blist" (diff)
downloadsynapse-erik-hackery.tar.xz
Merge branch 'develop' into matrix-org-hotfixes github/erik-hackery erik-hackery
Diffstat (limited to '')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index f9596bddaf..40eedb63cb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -34,8 +34,8 @@ REQUIREMENTS = { "bcrypt": ["bcrypt>=3.1.0"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], + "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"],