Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add systemd-python to optional dependencies #4339

Merged
merged 8 commits into from
Apr 16, 2019
Merged

Add systemd-python to optional dependencies #4339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c297d5
Add systemd-python to optional dependencies
silkeh Jan 1, 2019
c7528e6
Exclude systemd from "all".
hawkowl Mar 26, 2019
e0e8ecd
remove broken change
hawkowl Apr 16, 2019
ee83d29
Exclude systemd from [all]
hawkowl Apr 16, 2019
35c5658
Merge remote-tracking branch 'origin/develop' into add-systemd-python
hawkowl Apr 16, 2019
fb6f267
Update python_dependencies.py
hawkowl Apr 16, 2019
fa1cf73
unify where this happens
hawkowl Apr 16, 2019
6c43573
Merge branch 'add-systemd-python' of ssh://github.com/silkeh/synapse …
hawkowl Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4339.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add systemd-python to the optional dependencies to enable logging to the systemd journal. Install with `pip install matrix-synapse[systemd]`.
2 changes: 2 additions & 0 deletions docker/Dockerfile-dhvirtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \
debhelper \
devscripts \
dh-systemd \
libsystemd-dev \
lsb-release \
pkg-config \
python3-dev \
python3-pip \
python3-setuptools \
Expand Down
6 changes: 4 additions & 2 deletions synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,17 @@
"resources.consent": ["Jinja2>=2.9"],

"saml2": ["pysaml2>=4.5.0"],
"systemd": ["systemd-python>=231"],
"url_preview": ["lxml>=3.5.0"],
"test": ["mock>=2.0"],
}


def list_requirements():
deps = set(REQUIREMENTS)
for opt in CONDITIONAL_REQUIREMENTS.values():
deps = set(opt) | deps
for name, opts in CONDITIONAL_REQUIREMENTS.items():
if name not in ["systemd"]:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what the point of including systemd in CONDITIONAL_REQUIREMENTS in the first place is?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh wait, now I do. But I don't think changing this will change the behaviour for [all], which seems to be done in setup.py.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adfghdfh yes of course it won't :/

deps = set(opts) | deps

return list(deps)

Expand Down