diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-05-07 17:31:19 +0200 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-05-07 17:31:19 +0200 |
commit | 5bb26b7c4fa22ce3927fb365b5af06efec8cc4c7 (patch) | |
tree | 5abb3820f5e29c8eef26b78283afdf562198093c /synapse/python_dependencies.py | |
parent | Fixes typo (bellow -> below) (#7449) (diff) | |
parent | Add a configuration setting for the dummy event threshold (#7422) (diff) | |
download | synapse-5bb26b7c4fa22ce3927fb365b5af06efec8cc4c7.tar.xz |
Merge branch 'release-v1.13.0' into develop
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 733c51b758..39c99a2802 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -98,7 +98,9 @@ CONDITIONAL_REQUIREMENTS = { "sentry": ["sentry-sdk>=0.7.2"], "opentracing": ["jaeger-client>=4.0.0", "opentracing>=2.2.0"], "jwt": ["pyjwt>=1.6.4"], - "redis": ["txredisapi>=1.4.7"], + # hiredis is not a *strict* dependency, but it makes things much faster. + # (if it is not installed, we fall back to slow code.) + "redis": ["txredisapi>=1.4.7", "hiredis"], } ALL_OPTIONAL_REQUIREMENTS = set() # type: Set[str] |