Skip to content

removed python3-systemd and using libsystemd instead (BugFix) #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hook25 merged 2 commits into from
Jul 24, 2024
Merged

removed python3-systemd and using libsystemd instead (BugFix) #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd7492c
removed python3-systemd and using libsystemd instead
fernando79513 Jul 24, 2024
c58cff1
using systemd-python 233 to make it work in checkbox16
fernando79513 Jul 24, 2024
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
3 changes: 2 additions & 1 deletion checkbox-core-snap/series16/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ parts:
- python3-requests-unixsocket
- python3-serial
- python3-setuptools
- python3-systemd
- python3-yaml
- pyotherside
- libbluetooth3
- libsystemd0
- lsb-release
build-environment:
- PYTHONPATH: $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages:$PYTHONPATH
Expand All @@ -176,6 +176,7 @@ parts:
build-packages:
- gcc
- libbluetooth-dev
- libsystemd-dev
- python3-dev
- python3-pip
- lsb-release
Expand Down
3 changes: 2 additions & 1 deletion checkbox-core-snap/series18/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,14 @@ parts:
source-type: local
stage-packages:
- python3-requests-unixsocket
- python3-systemd
- libbluetooth3
- libsystemd0
python-packages:
- pynmea2
- pybluez
build-packages:
- libbluetooth-dev
- libsystemd-dev
- python3-dev
after: [acpi-tools]
build-environment:
Expand Down
3 changes: 2 additions & 1 deletion checkbox-core-snap/series20/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ parts:
- python3-bluez
- python3-pyparsing
- python3-requests-unixsocket
- python3-systemd
- libsystemd0
# added to stage python:
- libpython3-stdlib
- libpython3.8-stdlib
Expand All @@ -171,6 +171,7 @@ parts:
- python3.8-minimal
build-packages:
- libbluetooth-dev
- libsystemd-dev
- python3-dev
python-packages:
- pynmea2
Expand Down
3 changes: 2 additions & 1 deletion checkbox-core-snap/series22/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ parts:
- python3-bluez
- python3-pyparsing
- python3-requests-unixsocket
- python3-systemd
- libsystemd0
# added to stage python:
- libpython3-stdlib
- libpython3.10-stdlib
Expand All @@ -175,6 +175,7 @@ parts:
- python3.10-minimal
build-packages:
- libbluetooth-dev
- libsystemd-dev
- python3-dev
python-packages:
- pynmea2
Expand Down
3 changes: 2 additions & 1 deletion checkbox-core-snap/series24/snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ parts:
# actual requirements
- python3-bluez
- python3-pyparsing
- python3-systemd
- libsystemd0
# added to stage python:
- libpython3-stdlib
- libpython3.12-stdlib
Expand All @@ -113,6 +113,7 @@ parts:
- python3.12-minimal
build-packages:
- libbluetooth-dev
- libsystemd-dev
- python3-dev
python-packages:
- pynmea2
Expand Down
2 changes: 1 addition & 1 deletion checkbox-support/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'requests_unixsocket>=0.1.2; python_version>="3.5" and python_version<="3.11"',
'requests_unixsocket2; python_version>="3.12"',
'importlib_metadata; python_version<"3.8"',
'systemd-python==232; python_version=="3.5"',
'systemd-python==233; python_version=="3.5"',
'systemd-python>=235; python_version>="3.6"',
'pyyaml',
]
Expand Down
2 changes: 1 addition & 1 deletion checkbox-support/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install_requires=
requests_unixsocket >= 0.1.2; python_version>="3.5" and python_version<="3.11"
requests_unixsocket2; python_version>="3.12"
importlib_metadata; python_version<"3.8"
systemd-python == 232; python_version=="3.5"
systemd-python == 233; python_version=="3.5"
systemd-python == 235; python_version>="3.6"
[metadata]
name=checkbox-support
Expand Down
2 changes: 1 addition & 1 deletion checkbox-support/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ commands =
[testenv:py35]
deps =
pytest
systemd-python == 232
systemd-python == 233
coverage == 5.5
pytest-cov == 2.12.1
requests == 2.9.1
Expand Down