From 6fa33b9187a45f1e0903780559c33db7999bce4e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 20 Apr 2025 14:58:00 +0200 Subject: [PATCH 1/2] Fix AppImage build script --- pkgutils.py | 4 ++-- utils/build_appimage.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index 8062ae2c..8f72d8d1 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -273,7 +273,7 @@ if __name__ == "__main__": cmdBuildAppImage = parsers.add_parser( "build-appimage", help=( "Build an AppImage. " - "Argument --linux-tag defaults manylinux_2_28_x86_64, and --python-version to 3.11." + "Argument --linux-tag defaults manylinux_2_28_x86_64, and --python-version to 3.13." ) ) cmdBuildAppImage.add_argument( @@ -286,7 +286,7 @@ if __name__ == "__main__": ), ) cmdBuildAppImage.add_argument( - "--python-version", default="3.11", help="Python version (e.g. 3.11)" + "--python-version", default="3.13", help="Python version (e.g. 3.13)" ) cmdBuildAppImage.set_defaults(func=utils.build_appimage.appImage) diff --git a/utils/build_appimage.py b/utils/build_appimage.py index 72a30afe..ea784269 100644 --- a/utils/build_appimage.py +++ b/utils/build_appimage.py @@ -43,8 +43,8 @@ def appImage(args: argparse.Namespace) -> None: ) sys.exit(1) - if sys.platform == "linux": - print("ERROR: Command 'build-ubuntu' can only be used on Linux") + if sys.platform != "linux": + print("ERROR: Command 'build-appimage' can only be used on Linux") sys.exit(1) print("") From f458d1f9d1300cde13c9bac615383e51802ed4b0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 20 Apr 2025 15:01:06 +0200 Subject: [PATCH 2/2] Upgrade everything to run on Python 3.13 --- .github/workflows/build_assets.yml | 2 +- .github/workflows/build_linux.yml | 4 ++-- .github/workflows/build_mac.yml | 4 ++-- .github/workflows/build_win.yml | 2 +- .github/workflows/i18n.yml | 2 +- .github/workflows/test_mac.yml | 2 +- .github/workflows/test_win.yml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml index a39349d6..6b252624 100644 --- a/.github/workflows/build_assets.yml +++ b/.github/workflows/build_assets.yml @@ -9,7 +9,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" architecture: x64 - name: Install Packages (apt) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index e19de538..e44b0022 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -10,13 +10,13 @@ jobs: needs: buildAssets runs-on: ubuntu-latest env: - PYTHON_VERSION: "3.12" + PYTHON_VERSION: "3.13" LINUX_TAG: "manylinux_2_28_x86_64" steps: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" architecture: x64 - name: Install Packages (pip) diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index c0269a28..0b08977c 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -10,7 +10,7 @@ jobs: needs: buildAssets runs-on: macos-latest env: - PYTHON_VERSION: "3.12" + PYTHON_VERSION: "3.13" PACKAGE_ARCH: x86_64 MINICONDA_ARCH: x86_64 steps: @@ -41,7 +41,7 @@ jobs: needs: buildAssets runs-on: macos-latest env: - PYTHON_VERSION: "3.12" + PYTHON_VERSION: "3.13" PACKAGE_ARCH: aarch64 MINICONDA_ARCH: arm64 steps: diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 904d7482..b9e96e9d 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -13,7 +13,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" architecture: x64 - name: Checkout Source diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index 71bff9a3..45d91b07 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -12,7 +12,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" architecture: x64 - name: Install Packages (apt) run: | diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 7fde6b28..8465f75b 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -17,7 +17,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" architecture: x64 - name: Install Packages (brew) run: | diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 1765e40e..f2887216 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -17,7 +17,7 @@ jobs: - name: Python Setup uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" architecture: x64 - name: Checkout Source uses: actions/checkout@v4