diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-25 11:50:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:50:11 +0100 |
commit | 94133d7ce8ab8dca8b8f47c0f2666d59486884a5 (patch) | |
tree | d472d3d5530e45eee0c156a0446bf42da0a81288 /synapse/python_dependencies.py | |
parent | Fix iteration of requests_missing_keys; list doesn't have .values() (diff) | |
parent | Fix logcontxt leak in keyclient (#2465) (diff) | |
download | synapse-94133d7ce8ab8dca8b8f47c0f2666d59486884a5.tar.xz |
Merge branch 'develop' into develop
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index ed7f1c89ad..630e92c90e 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -31,7 +31,7 @@ REQUIREMENTS = { "pyyaml": ["yaml"], "pyasn1": ["pyasn1"], "daemonize": ["daemonize"], - "py-bcrypt": ["bcrypt"], + "bcrypt": ["bcrypt"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], "ujson": ["ujson"], @@ -40,6 +40,7 @@ REQUIREMENTS = { "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], + "affinity": ["affinity"], } CONDITIONAL_REQUIREMENTS = { "web_client": { |