Skip to content
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

Update runtime to 24.08, remove unused dependencies #29

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Update runtime to 24.08, remove unused dependencies #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1420cfc
remove dbus-python (unused since 2.2.2)
deltragon Oct 4, 2024
dd33499
remove libappindicator (unused since 2.2.2)
deltragon Oct 7, 2024
12b2334
update runtime to 24.08; remove runtime provided packages
deltragon Oct 7, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git clone --recursive https://github.com/flathub/io.github.slgobinath.SafeEyes &
# install flatpak and flatpak-builder then add flathub
sudo apt install flatpak flatpak-builder && flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
# install flatpak runtime
flatpak install -y org.freedesktop.Sdk/x86_64/23.08
flatpak install -y org.freedesktop.Sdk/x86_64/24.08
# build
flatpak-builder --user --install --force-clean build-dir io.github.slgobinath.SafeEyes.yaml
```
17 changes: 6 additions & 11 deletions io.github.slgobinath.SafeEyes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id: io.github.slgobinath.SafeEyes
sdk: org.freedesktop.Sdk
runtime: org.freedesktop.Platform
runtime-version: "23.08"
runtime-version: "24.08"
command: safeeyes

finish-args:
Expand Down Expand Up @@ -33,23 +33,18 @@ cleanup:
- /lib/*.la

modules:
- shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json # app indicator support
- shared-modules/libappindicator/libappindicator-gtk3-12.10.json

# alsa-utils, dbus-python, libnotify, xprop -> anitya configured.
# alsa-utils, xprop -> anitya configured.
# wlrctl, xprintidle -> manual checks
- modules/python3-requirements.yml # auto generated pip dependencies for safeeyes
- modules/dbus-python.yml # dbus - for tray
- modules/xprop.yml # required for 'xorg do not disturb' plugin
- modules/wlrctl.yml # required for 'wayland do not disturb' plugin (x86_64 only)
- modules/alsa-utils.yml # required for 'audible alert' plugin
- modules/libnotify.yml # notification support
- modules/xprintidle.yml # idle detection other than gnome
- modules/python3-requirements.yml # auto generated pip dependencies for safeeyes
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was moved to the last entry. The order here does not seem to make a difference, except that when building, it will rebuild all following entry after a changed one.
When developing with local changes in upstream safeeyes, this means that xprop, etc. would previously get rebuilt unnecessary, where now only everything in python3-requirements.yml needs to be rebuilt.


- name: safeeyes
buildsystem: simple
build-commands:
- cp -r /app/lib/python3.11/site-packages/safeeyes/platform/icons/ /app/share/icons/
- install -Dm644 /app/lib/python3.11/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.desktop /app/share/applications/io.github.slgobinath.SafeEyes.desktop
- install -Dm644 /app/lib/python3.11/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml /app/share/metainfo/io.github.slgobinath.SafeEyes.metainfo.xml
- cp -r /app/lib/python3.12/site-packages/safeeyes/platform/icons/ /app/share/icons/
- install -Dm644 /app/lib/python3.12/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.desktop /app/share/applications/io.github.slgobinath.SafeEyes.desktop
- install -Dm644 /app/lib/python3.12/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml /app/share/metainfo/io.github.slgobinath.SafeEyes.metainfo.xml
- desktop-file-edit --set-key=Exec --set-value=safeeyes /app/share/applications/io.github.slgobinath.SafeEyes.desktop
10 changes: 0 additions & 10 deletions modules/dbus-python.yml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions modules/libnotify.yml
View file
Open in desktop

This file was deleted.

60 changes: 5 additions & 55 deletions modules/python3-requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,13 @@
# To create this file use 'requires' in setup to generate requirements.txt file -> https://github.com/slgobinath/SafeEyes/blob/13bf3e8f0226b58497f9184ddc42dbdaa4a5f14b/setup.py#L6
# do not add dbus-python and add --no-deps for safeeyes package
# To create this file use 'requires' in setup to generate requirements.txt file -> https://github.com/slgobinath/SafeEyes/blob/v2.2.2/setup.py#L6
# add --no-deps for safeeyes package
# order would be:
# meson-python -> pycairo -> other dependencies excluding dbus-python -> safeeyes (--no-deps)
# dependencies -> safeeyes (--no-deps)
# * remember to remove repeating packages for cleaner view
# Generated with flatpak-pip-generator --yaml --checker-data --requirements-file=requirements.txt --output python3-requirements --runtime=org.freedesktop.Sdk//23.08
# * remove runtime-provided packages like PyGObject and packaging
# Generated with flatpak-pip-generator --yaml --checker-data --requirements-file=requirements.txt --output python3-requirements --runtime=org.freedesktop.Sdk//24.08
build-commands: []
buildsystem: simple
modules:
- name: python3-meson-python
buildsystem: simple
build-commands:
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
--prefix=${FLATPAK_DEST} "meson-python" --no-build-isolation
sources:
- type: file
url: https://files.pythonhosted.org/packages/91/c0/104cb6244c83fe6bc3886f144cc433db0c0c78efac5dc00e409a5a08c87d/meson_python-0.16.0-py3-none-any.whl
sha256: 842dc9f5dc29e55fc769ff1b6fe328412fe6c870220fc321060a1d2d395e69e8
x-checker-data:
name: meson_python
packagetype: bdist_wheel
type: pypi
- type: file
url: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl
sha256: 5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
x-checker-data:
name: packaging
packagetype: bdist_wheel
type: pypi
- type: file
url: https://files.pythonhosted.org/packages/aa/5f/bb5970d3d04173b46c9037109f7f05fc8904ff5be073ee49bb6ff00301bc/pyproject_metadata-0.8.0-py3-none-any.whl
sha256: ad858d448e1d3a1fb408ac5bac9ea7743e7a8bbb472f2693aaa334d2db42f526
x-checker-data:
name: pyproject_metadata
packagetype: bdist_wheel
type: pypi
- name: python3-pycairo
buildsystem: simple
build-commands:
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
--prefix=${FLATPAK_DEST} "pycairo" --no-build-isolation
sources:
- type: file
url: https://files.pythonhosted.org/packages/07/4a/42b26390181a7517718600fa7d98b951da20be982a50cd4afb3d46c2e603/pycairo-1.27.0.tar.gz
sha256: 5cb21e7a00a2afcafea7f14390235be33497a2cce53a98a19389492a60628430
x-checker-data:
name: pycairo
type: pypi
- name: python3-babel
buildsystem: simple
build-commands:
Expand Down Expand Up @@ -98,18 +60,6 @@ modules:
name: pytz
packagetype: bdist_wheel
type: pypi
- name: python3-PyGObject
buildsystem: simple
build-commands:
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
--prefix=${FLATPAK_DEST} "PyGObject" --no-build-isolation
sources:
- type: file
url: https://files.pythonhosted.org/packages/2b/58/d34e67a79631177e3c08e7d02b5165147f590171f2cae6769502af5f7f7e/pygobject-3.50.0.tar.gz
sha256: 4500ad3dbf331773d8dedf7212544c999a76fc96b63a91b3dcac1e5925a1d103
x-checker-data:
name: pygobject
type: pypi
- name: python3-python-xlib
buildsystem: simple
build-commands:
Expand Down