summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorSilke Hofstra <silkeh@users.noreply.github.com>2019-04-16 12:41:17 +0200
committerAmber Brown <hawkowl@atleastfornow.net>2019-04-16 20:41:17 +1000
commita137f4eac028fefda0787a168dd8853653155bc3 (patch)
treefb81c255fdf0f384aa4d69aa24322dcda9fa6add /setup.py
parentMerge pull request #5063 from matrix-org/erikj/move_endpoints (diff)
downloadsynapse-a137f4eac028fefda0787a168dd8853653155bc3.tar.xz
Add systemd-python to optional dependencies (#4339)
Using systemd-python allows for logging to the systemd journal,
as is documented in: `synapse/contrib/systemd/log_config.yaml`.

Signed-off-by: Silke Hofstra <silke@slxh.eu>
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 55b1b10a77..55663e9cac 100755
--- a/setup.py
+++ b/setup.py
@@ -86,13 +86,9 @@ long_description = read_file(("README.rst",))
 
 REQUIREMENTS = dependencies['REQUIREMENTS']
 CONDITIONAL_REQUIREMENTS = dependencies['CONDITIONAL_REQUIREMENTS']
+ALL_OPTIONAL_REQUIREMENTS = dependencies['ALL_OPTIONAL_REQUIREMENTS']
 
 # Make `pip install matrix-synapse[all]` install all the optional dependencies.
-ALL_OPTIONAL_REQUIREMENTS = set()
-
-for optional_deps in CONDITIONAL_REQUIREMENTS.values():
-    ALL_OPTIONAL_REQUIREMENTS = set(optional_deps) | ALL_OPTIONAL_REQUIREMENTS
-
 CONDITIONAL_REQUIREMENTS["all"] = list(ALL_OPTIONAL_REQUIREMENTS)