Skip to content

Commit

Permalink
Update Flatpak runtime and dependencies
Browse files Browse the repository at this point in the history
Refs: #178
  • Loading branch information
orontee committed Jul 18, 2024
1 parent e474e21 commit 354f677
Show file tree
Hide file tree
Showing 8 changed files with 2,043 additions and 750 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ po/io.github.orontee.Argos.pot
/argos_*.deb
repo/
/.python-version
/requirements.txt
18 changes: 11 additions & 7 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,29 @@ To update translation files::
Dependencies
============

Python runtime dependencies can be added using `poetry add`. Once the
code is ready, one must update two files used respectively for Flatpak
and DEB packaging.
Python runtime dependencies can be added using ``poetry add``. Once
the code is ready, one must update two files used respectively for
Flatpak and DEB packaging.

* Flatpak builder install runtime dependencies described in the file
`argos-dependencies.json </argos-dependencies.json>`_. It has been
`pypi-dependencies.json </pypi-dependencies.json>`_. It has been
generated from ``poetry``'s lock file using `flatpak-builder-tools
<https://github.com/flatpak/flatpak-builder-tools>`_ but it's
straightforward to maintain by hand.

(Note that when building, `meson` displays Python version, platform,
compatibility tags, etc.: All information required to choose the
right wheels.)
(Note that when building, ``meson`` displays Python version,
platform, compatibility tags, etc.: All information required to
choose the right wheels.)

* DEB packages define runtime dependencies from the `debian/control
</debian/control>`_ file.

Build dependencies are listed in the `Containerfile </Containerfile>`_.

Dependencies are locked from Poetry point of view. In order to list
possible dependencies updates run ``poetry show --latest
--top-level``.

Tests
=====

Expand Down
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ user that will run Argos. Changes can be made using `Dconf Editor

$ gsettings set io.github.orontee.Argos mopidy-base-url http://192.168.1.45

(When running the Flatpak version, don't forget to enter the "sandbox"
before running `gsettings` commands; See `CONTRIBUTING file
</CONTRIBUTING.rst>`_ for details on this topic.)

Some CLI options are provided (complete list can be obtained with
``argos --help``)::

Expand Down
105 changes: 0 additions & 105 deletions argos-dependencies.json

This file was deleted.

4 changes: 2 additions & 2 deletions io.github.orontee.Argos.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id" : "io.github.orontee.Argos",
"runtime" : "org.gnome.Sdk",
"runtime-version" : "44",
"runtime-version" : "45",
"sdk" : "org.gnome.Sdk",
"command" : "argos",
"finish-args" : [
Expand All @@ -23,7 +23,7 @@
"*.a"
],
"modules" : [
"argos-dependencies.json",
"pypi-dependencies.json",
{
"name": "webp-pixbuf-loader",
"buildsystem": "meson",
Expand Down
Loading

0 comments on commit 354f677

Please sign in to comment.