From ec738fc0223cfaf99bed3620a31b647c18494734 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 22 Feb 2021 16:51:53 +0000 Subject: [PATCH 1/2] Add a comment about systemd-python. This confused me for a while. --- changelog.d/9464.misc | 1 + synapse/python_dependencies.py | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 changelog.d/9464.misc diff --git a/changelog.d/9464.misc b/changelog.d/9464.misc new file mode 100644 index 000000000000..39fcf85d4006 --- /dev/null +++ b/changelog.d/9464.misc @@ -0,0 +1 @@ +Add a comment about systemd-python. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 8a2b73b75e3c..924f1c2e3917 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -106,7 +106,12 @@ "pysaml2>=4.5.0;python_version>='3.6'", ], "oidc": ["authlib>=0.14.0"], + + # systemd-python is necessary for logging to the systemd journal via + # `systemd.journal.JournalHandler`, as is documented in + # `contrib/systemd/log_config.yaml`. "systemd": ["systemd-python>=231"], + "url_preview": ["lxml>=3.5.0"], "sentry": ["sentry-sdk>=0.7.2"], "opentracing": ["jaeger-client>=4.0.0", "opentracing>=2.2.0"], From 65166bc049cd85b8dc8f7fd2730b02dbc223f23f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 23 Feb 2021 10:28:45 +0000 Subject: [PATCH 2/2] pacify black --- synapse/python_dependencies.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 924f1c2e3917..321a33382068 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -106,12 +106,10 @@ "pysaml2>=4.5.0;python_version>='3.6'", ], "oidc": ["authlib>=0.14.0"], - # systemd-python is necessary for logging to the systemd journal via # `systemd.journal.JournalHandler`, as is documented in # `contrib/systemd/log_config.yaml`. "systemd": ["systemd-python>=231"], - "url_preview": ["lxml>=3.5.0"], "sentry": ["sentry-sdk>=0.7.2"], "opentracing": ["jaeger-client>=4.0.0", "opentracing>=2.2.0"],