From 965be24bc9b098f0f8fea452e7b0fa20b02976bf Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:05:56 +0200 Subject: [PATCH 1/4] manifest: Update GNOME runtime --- com.usebottles.bottles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml index e619cfc991..500b445cf0 100644 --- a/com.usebottles.bottles.yml +++ b/com.usebottles.bottles.yml @@ -3,7 +3,7 @@ sdk: org.gnome.Sdk runtime: org.gnome.Platform base: org.winehq.Wine base-version: stable-23.08 -runtime-version: &runtime-version '46' +runtime-version: &runtime-version '47' command: bottles finish-args: From 4bc065d30bcf7dd368950dd24fc31dc431cd26ec Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:24:10 +0200 Subject: [PATCH 2/4] automation: Reflect python 3.12 update from GNOME runtime and allow manual update --- .github/workflows/update-manifest.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-manifest.yml b/.github/workflows/update-manifest.yml index 99cf23dca9..199eaf0954 100644 --- a/.github/workflows/update-manifest.yml +++ b/.github/workflows/update-manifest.yml @@ -11,6 +11,7 @@ on: env: PR_BRANCH: pr/ci-manifest/${{ github.ref_name }} FEDC_ARGS: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml" + UPDATE_PYTHON: false jobs: update-manifest: @@ -36,7 +37,7 @@ jobs: git config user.name "github-actions[bot]" pur -r requirements.txt pur -r requirements.dev.txt - req2flatpak --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml + req2flatpak --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o com.usebottles.bottles.pypi-deps.yaml git diff ${{ github.ref_name }} --exit-code requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml updated=$? if [ $updated -ne 0 ]; then @@ -49,6 +50,7 @@ jobs: run: | remove_important_update_only=$(sed 's/--require-important-update//g' <<< '${{ env.FEDC_ARGS }}') echo "FEDC_ARGS=$remove_important_update_only" >> $GITHUB_ENV + echo "UPDATE_PYTHON=true" >> $GITHUB_ENV - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest env: @@ -69,7 +71,7 @@ jobs: git push -f --set-upstream origin ${{ env.PR_BRANCH }} git diff ${{ github.ref_name }} --exit-code com.usebottles.bottles.yml updated=$? - if [ $updated -ne 0 ]; then + if [ $updated -ne 0 ] || [ "${{ env.UPDATE_PYTHON }}" = true ]; then gh pr create --title ":robot:: Update manifest (important)" --body ":wrench: One or more modules marked as 'important' have been updated." --head ${{ env.PR_BRANCH }} --base ${{ github.ref_name }} exit 0 fi From 4bfe9717daf71fb148c6b7bd8bf76692f58434b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:25:28 +0000 Subject: [PATCH 3/4] Update PyPI dependencies (#34) Co-authored-by: github-actions[bot] --- com.usebottles.bottles.pypi-deps.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.usebottles.bottles.pypi-deps.yaml b/com.usebottles.bottles.pypi-deps.yaml index fdb5960169..3ef424bd66 100644 --- a/com.usebottles.bottles.pypi-deps.yaml +++ b/com.usebottles.bottles.pypi-deps.yaml @@ -1,4 +1,4 @@ -# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml +# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o com.usebottles.bottles.pypi-deps.yaml name: python3-package-installation buildsystem: simple build-commands: @@ -17,8 +17,8 @@ sources: url: https://files.pythonhosted.org/packages/2b/58/d34e67a79631177e3c08e7d02b5165147f590171f2cae6769502af5f7f7e/pygobject-3.50.0.tar.gz sha256: 4500ad3dbf331773d8dedf7212544c999a76fc96b63a91b3dcac1e5925a1d103 - type: file - url: https://files.pythonhosted.org/packages/75/e4/2c27590dfc9992f73aabbeb9241ae20220bd9452df27483b6e56d3975cc5/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 + url: https://files.pythonhosted.org/packages/b9/2b/614b4752f2e127db5cc206abc23a8c19678e92b23c3db30fc86ab731d3bd/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 only-arches: - x86_64 - type: file @@ -28,8 +28,8 @@ sources: url: https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl sha256: e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970 - type: file - url: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 + url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b only-arches: - x86_64 - type: file @@ -39,8 +39,8 @@ sources: url: https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl sha256: 946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3 - type: file - url: https://files.pythonhosted.org/packages/d3/cb/55205f3f1ee6ba80c0a9a18ca07423003ca8de99192b18be30f1f31b4cdd/orjson-3.10.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: b58d3795dafa334fc8fd46f7c5dc013e6ad06fd5b9a4cc98cb1456e7d3558bd6 + url: https://files.pythonhosted.org/packages/a0/6b/34e6904ac99df811a06e42d8461d47b6e0c9b86e2fe7ee84934df6e35f0d/orjson-3.10.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: a0c6a008e91d10a2564edbb6ee5069a9e66df3fbe11c9a005cb411f441fd2c09 only-arches: - x86_64 - type: file @@ -56,8 +56,8 @@ sources: url: https://files.pythonhosted.org/packages/07/4a/42b26390181a7517718600fa7d98b951da20be982a50cd4afb3d46c2e603/pycairo-1.27.0.tar.gz sha256: 5cb21e7a00a2afcafea7f14390235be33497a2cce53a98a19389492a60628430 - type: file - url: https://files.pythonhosted.org/packages/d1/64/82fc5c3584fa11462732ddbf76cf23215d725bb224910517099f53017a3b/pycurl-7.45.3-cp311-cp311-manylinux_2_28_x86_64.whl - sha256: 1e0d32d6ed3a7ba13dbbd3a6fb50ca76c40c70e6bc6fe347f90677478d3422c7 + url: https://files.pythonhosted.org/packages/65/80/8791945007e2295806bfd0e982e00fee023517b17d5b2d845ca64c81878c/pycurl-7.45.3-cp312-cp312-manylinux_2_28_x86_64.whl + sha256: 3d07c5daef2d0d85949e32ec254ee44232bb57febb0634194379dd14d1ff4f87 only-arches: - x86_64 - type: file From b9fb127fc97d9e7947113d01f5866f6c340b38b1 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:38:15 +0200 Subject: [PATCH 4/4] manifest: Update to 24.08 branch and remove org.winehq.Wine.DLLs dependency --- com.usebottles.bottles.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml index 500b445cf0..20a1c86335 100644 --- a/com.usebottles.bottles.yml +++ b/com.usebottles.bottles.yml @@ -2,7 +2,7 @@ id: com.usebottles.bottles sdk: org.gnome.Sdk runtime: org.gnome.Platform base: org.winehq.Wine -base-version: stable-23.08 +base-version: stable-24.08 runtime-version: &runtime-version '47' command: bottles @@ -28,7 +28,6 @@ inherit-extensions: - org.freedesktop.Platform.ffmpeg_full.i386 - org.winehq.Wine.gecko - org.winehq.Wine.mono - - org.winehq.Wine.DLLs add-extensions: org.gnome.Platform.Compat.i386: