chore: move build commands out of Flatpak manifest

Author: ledif

justfile

@@ -27,10 +27,10 @@ generate-flatpak-python3-modules:
   pip install requirements-parser PyYAML
 
 
-  curl -L -o "${TEMP_DIR}/flatpak-pip-generator" https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/pip/flatpak-pip-generator
+  curl -L -o "${TEMP_DIR}/flatpak-pip-generator" https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/pip/flatpak-pip-generator.py
   chmod +x "${TEMP_DIR}/flatpak-pip-generator"
 
-  ${TEMP_DIR}/flatpak-pip-generator --yaml --checker-data --cleanup scripts requests tomli xdg-base-dirs
+  ${TEMP_DIR}/flatpak-pip-generator --yaml --checker-data --cleanup scripts requests tomli xdg-base-dirs poetry-core
 
   deactivate
   rm -rf "${TEMP_DIR}"

packaging/land.arcana.TarotCanvas.flathub.yml

@@ -6,7 +6,7 @@ base: com.riverbankcomputing.PyQt.BaseApp
 base-version: '6.10'
 command: tarot-canvas
 finish-args:
-  - --share=network                       # Needed to download reference decks
+  - --share=network # Needed to download reference decks
   - --socket=wayland
   - --socket=fallback-x11
   - --share=ipc
@@ -16,18 +16,12 @@ modules:
   - name: tarot-canvas
     buildsystem: simple
     build-commands:
-      - |
-        PYTHON_VERSION=$(python3 -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')") && \
-        SITE_PACKAGES="${FLATPAK_DEST}/lib/python${PYTHON_VERSION}/site-packages" && \
-        mkdir -p ${SITE_PACKAGES} && \
-        cp -r tarot_canvas ${SITE_PACKAGES}/
-
+      - pip3 install --no-deps --no-build-isolation --prefix=${FLATPAK_DEST} .
       - install -Dm644 packaging/land.arcana.TarotCanvas.desktop ${FLATPAK_DEST}/share/applications/land.arcana.TarotCanvas.desktop
       - install -Dm644 packaging/icon.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/land.arcana.TarotCanvas.svg
       - install -Dm644 packaging/land.arcana.TarotCanvas.appdata.xml ${FLATPAK_DEST}/share/metainfo/land.arcana.TarotCanvas.metainfo.xml
-      - install -Dm755 packaging/tarot-canvas-launcher.sh ${FLATPAK_DEST}/bin/tarot-canvas
 
     sources:
       - type: archive
-        url: https://github.com/arcanaland/tarot-canvas/releases/download/v1.1.0/tarot-canvas-1.1.0.tar.gz
-        sha256: bdd276123991744fd208a09f5e5e30dcdb76c4538c2fd58312ce84cbb814e6d8
+        url: https://github.com/arcanaland/tarot-canvas/releases/download/v1.1.1/tarot-canvas-1.1.1.tar.gz
+        sha256: 5a48f3070c363a2fd21715d04424bed730cf958f6718e658fd56049631519bd6

packaging/land.arcana.TarotCanvas.yml

@@ -6,7 +6,7 @@ base: com.riverbankcomputing.PyQt.BaseApp
 base-version: '6.10'
 command: tarot-canvas
 finish-args:
-  - --share=network                       # Needed to download reference decks
+  - --share=network # Needed to download reference decks
   - --socket=wayland
   - --socket=fallback-x11
   - --share=ipc
@@ -16,21 +16,10 @@ modules:
   - name: tarot-canvas
     buildsystem: simple
     build-commands:
-      - |
-        PYTHON_VERSION=$(python3 -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')") && \
-        SITE_PACKAGES="${FLATPAK_DEST}/lib/python${PYTHON_VERSION}/site-packages" && \
-        mkdir -p ${SITE_PACKAGES} && \
-        cp -r tarot_canvas ${SITE_PACKAGES}/
-
-      - mkdir -p ${FLATPAK_DEST}/bin
-      - mkdir -p ${FLATPAK_DEST}/share/applications
-      - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps
-      - mkdir -p ${FLATPAK_DEST}/share/metainfo
-
+      - pip3 install --no-deps --no-build-isolation --prefix=${FLATPAK_DEST} .
       - install -Dm644 packaging/land.arcana.TarotCanvas.desktop ${FLATPAK_DEST}/share/applications/land.arcana.TarotCanvas.desktop
-      - install -Dm644 packaging/icon.png ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/land.arcana.TarotCanvas.png
+      - install -Dm644 packaging/icon.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/land.arcana.TarotCanvas.svg
       - install -Dm644 packaging/land.arcana.TarotCanvas.appdata.xml ${FLATPAK_DEST}/share/metainfo/land.arcana.TarotCanvas.metainfo.xml
-      - install -Dm755 packaging/tarot-canvas-launcher.sh ${FLATPAK_DEST}/bin/tarot-canvas
 
     sources:
       - type: dir

packaging/python3-modules.yaml

@@ -1,79 +1,95 @@
-# Generated with flatpak-pip-generator --yaml --checker-data --cleanup scripts requests tomli xdg-base-dirs
+# Generated with flatpak-pip-generator --yaml --checker-data --cleanup scripts requests tomli xdg-base-dirs poetry-core
 build-commands: []
 buildsystem: simple
 modules:
-  - name: python3-requests
-    buildsystem: simple
-    build-commands:
-      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
-        --prefix=${FLATPAK_DEST} "requests" --no-build-isolation
-    sources:
-      - type: file
-        url: https://files.pythonhosted.org/packages/4a/7e/3db2bd1b1f9e95f7cddca6d6e75e2f2bd9f51b1246e546d88addca0106bd/certifi-2025.4.26-py3-none-any.whl
-        sha256: 30350364dfe371162649852c63336a15c70c6510c2ad5015b21c2345311805f3
-        x-checker-data:
-          name: certifi
-          packagetype: bdist_wheel
-          type: pypi
-      - type: file
-        url: https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz
-        sha256: 5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63
-        x-checker-data:
-          name: charset_normalizer
-          type: pypi
-      - type: file
-        url: https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl
-        sha256: 946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
-        x-checker-data:
-          name: idna
-          packagetype: bdist_wheel
-          type: pypi
-      - type: file
-        url: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl
-        sha256: 70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-        x-checker-data:
-          name: requests
-          packagetype: bdist_wheel
-          type: pypi
-      - type: file
-        url: https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl
-        sha256: 4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813
-        x-checker-data:
-          name: urllib3
-          packagetype: bdist_wheel
-          type: pypi
-    cleanup:
-      - /bin
-      - /share/man/man1
-  - name: python3-tomli
-    buildsystem: simple
-    build-commands:
-      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
-        --prefix=${FLATPAK_DEST} "tomli" --no-build-isolation
-    sources:
-      - type: file
-        url: https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz
-        sha256: cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff
-        x-checker-data:
-          name: tomli
-          type: pypi
-    cleanup:
-      - /bin
-      - /share/man/man1
-  - name: python3-xdg-base-dirs
-    buildsystem: simple
-    build-commands:
-      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
-        --prefix=${FLATPAK_DEST} "xdg-base-dirs" --no-build-isolation
-    sources:
-      - type: file
-        url: https://files.pythonhosted.org/packages/fc/03/030b47fd46b60fc87af548e57ff59c2ca84b2a1dadbe721bb0ce33896b2e/xdg_base_dirs-6.0.2-py3-none-any.whl
-        sha256: 3c01d1b758ed4ace150ac960ac0bd13ce4542b9e2cdf01312dcda5012cfebabe
-        x-checker-data:
-          name: xdg_base_dirs
-          packagetype: bdist_wheel
-          type: pypi
-    cleanup:
-      - /bin
-      - /share/man/man1
+- name: python3-requests
+  buildsystem: simple
+  build-commands:
+  - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+    --prefix=${FLATPAK_DEST} "requests" --no-build-isolation
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/70/7d/9bc192684cea499815ff478dfcdc13835ddf401365057044fb721ec6bddb/certifi-2025.11.12-py3-none-any.whl
+    sha256: 97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b
+    x-checker-data:
+      name: certifi
+      packagetype: bdist_wheel
+      type: pypi
+  - type: file
+    url: https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz
+    sha256: 94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a
+    x-checker-data:
+      name: charset_normalizer
+      type: pypi
+  - type: file
+    url: https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl
+    sha256: 771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea
+    x-checker-data:
+      name: idna
+      packagetype: bdist_wheel
+      type: pypi
+  - type: file
+    url: https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl
+    sha256: 2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6
+    x-checker-data:
+      name: requests
+      packagetype: bdist_wheel
+      type: pypi
+  - type: file
+    url: https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl
+    sha256: e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
+    x-checker-data:
+      name: urllib3
+      packagetype: bdist_wheel
+      type: pypi
+  cleanup:
+  - /bin
+  - /share/man/man1
+- name: python3-tomli
+  buildsystem: simple
+  build-commands:
+  - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+    --prefix=${FLATPAK_DEST} "tomli" --no-build-isolation
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/52/ed/3f73f72945444548f33eba9a87fc7a6e969915e7b1acc8260b30e1f76a2f/tomli-2.3.0.tar.gz
+    sha256: 64be704a875d2a59753d80ee8a533c3fe183e3f06807ff7dc2232938ccb01549
+    x-checker-data:
+      name: tomli
+      type: pypi
+  cleanup:
+  - /bin
+  - /share/man/man1
+- name: python3-xdg-base-dirs
+  buildsystem: simple
+  build-commands:
+  - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+    --prefix=${FLATPAK_DEST} "xdg-base-dirs" --no-build-isolation
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/fc/03/030b47fd46b60fc87af548e57ff59c2ca84b2a1dadbe721bb0ce33896b2e/xdg_base_dirs-6.0.2-py3-none-any.whl
+    sha256: 3c01d1b758ed4ace150ac960ac0bd13ce4542b9e2cdf01312dcda5012cfebabe
+    x-checker-data:
+      name: xdg_base_dirs
+      packagetype: bdist_wheel
+      type: pypi
+  cleanup:
+  - /bin
+  - /share/man/man1
+- name: python3-poetry-core
+  buildsystem: simple
+  build-commands:
+  - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+    --prefix=${FLATPAK_DEST} "poetry-core" --no-build-isolation
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/c7/d8/bb2f602f5e012e177e1c8560125f9770945d36622595990cf1cb794477c2/poetry_core-2.2.1-py3-none-any.whl
+    sha256: bdfce710edc10bfcf9ab35041605c480829be4ab23f5bc01202cfe5db8f125ab
+    x-checker-data:
+      name: poetry_core
+      packagetype: bdist_wheel
+      type: pypi
+  cleanup:
+  - /bin
+  - /share/man/man1
 name: python3-modules

packaging/tarot-canvas-launcher.sh

@@ -9,6 +9,7 @@ description = "A cross-platform Qt6 application for viewing and exploring tarot
 authors = ["Adam Fidel <[email protected]>"]
 readme = "README.md"
 packages = [{include = "tarot_canvas"}]  # This directly uses the tarot_canvas directory at the project root
+include = ["tarot_canvas/resources/**/*"]
 license = "MIT"
 homepage = "https://github.com/arcanaland/tarot-canvas"
 repository = "https://github.com/arcanaland/tarot-canvas"