From 51b6314901a1397fd6e75a33404c32becc52d3b6 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 6 May 2020 16:16:17 +0100 Subject: [PATCH 1/2] install hiredis --- changelog.d/7439.feature | 1 + synapse/python_dependencies.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog.d/7439.feature diff --git a/changelog.d/7439.feature b/changelog.d/7439.feature new file mode 100644 index 000000000000..ce6140fdd111 --- /dev/null +++ b/changelog.d/7439.feature @@ -0,0 +1 @@ +Add support for running replication over Redis when using workers. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 733c51b75841..84568409d289 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -98,7 +98,10 @@ "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] From bf2c5bc9101e0f82bed0c2f7f1283baa2e8ad59a Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 6 May 2020 16:23:02 +0100 Subject: [PATCH 2/2] fix lint --- synapse/python_dependencies.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 84568409d289..39c99a280230 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -98,10 +98,9 @@ "sentry": ["sentry-sdk>=0.7.2"], "opentracing": ["jaeger-client>=4.0.0", "opentracing>=2.2.0"], "jwt": ["pyjwt>=1.6.4"], - # 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" ], + "redis": ["txredisapi>=1.4.7", "hiredis"], } ALL_OPTIONAL_REQUIREMENTS = set() # type: Set[str]