Merge branch 'main' into py3.13-support

Author: freakboy3742

.github/workflows/ci.yml

@@ -6,9 +6,17 @@ on:
       - main
   workflow_call:
 
+# Cancel active CI runs for a PR before starting another run
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
-    shell: bash  # https://github.com/beeware/briefcase/pull/912
+    shell: bash
+
+env:
+  FORCE_COLOR: "1"
 
 jobs:
   pre-commit:
@@ -55,17 +63,17 @@ jobs:
           - backend: linux-system
             runs-on: ubuntu-latest
             python-version: "system"
-            pre-command: "sudo apt-get install -qq python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config"
+            pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends python3-dev python3-pip libcairo2-dev libgirepository1.0-dev gir1.2-gtk-3.0"
             briefcase-target: "linux system"
 
           # - backend: linux-appimage
           #   runs-on: ubuntu-latest
-          #   pre-command: "sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config libfuse2"
+          #   pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends libfuse2 libthai-dev libegl1"
           #   briefcase-target: "linux appimage"
 
           - backend: linux-flatpak
             runs-on: ubuntu-latest
-            pre-command: "sudo apt-get install -qq python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config flatpak flatpak-builder"
+            pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends flatpak flatpak-builder elfutils"
             briefcase-target: "linux flatpak"
 
           - backend: windows-VisualStudio
@@ -84,43 +92,37 @@ jobs:
           - backend: android
             runs-on: ubuntu-latest
             briefcase-target: "android"
+            briefcase-run-args: >
+              --device '{"avd":"beePhone"}'
+              --Xemulator=-no-window
+              --Xemulator=-no-snapshot
+              --Xemulator=-no-audio
+              --Xemulator=-no-boot-anim
+              --shutdown-on-exit
             pre-command: |
-              # check if virtualization is supported...
-              sudo apt install -qq --no-install-recommends cpu-checker coreutils && echo "CPUs=$(nproc --all)" && kvm-ok
               # allow access to KVM to run the emulator
               echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
                 | sudo tee /etc/udev/rules.d/99-kvm4all.rules
               sudo udevadm control --reload-rules
               sudo udevadm trigger --name-match=kvm
-            briefcase-run-args: " -d '{\"avd\":\"beePhone\"}' --Xemulator=-no-window --Xemulator=-no-snapshot --Xemulator=-no-audio --Xemulator=-no-boot-anim --shutdown-on-exit"
-
         exclude:
           # Binary packages aren't available for 3.12+ on Android yet
-          - backend: "android"
-            python-version: "3.12"
-
-          - backend: "android"
-            python-version: "3.13-dev"
-
-          # Support packages for Flatpak aren't available for 3.12+ on Linux yet
-          - backend: "linux-flatpak"
+          - backend: android
             python-version: "3.12"
 
-          - backend: "linux-flatpak"
-            python-version: "3.13-dev"
-
     steps:
-    - uses: actions/[email protected]
+    - name: Checkout
+      uses: actions/[email protected]
       with:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v4.7.1
+      uses: actions/setup-python@v5.1.1
       if: matrix.python-version != 'system'
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install dependencies
+    - name: Install Dependencies
       run: ${{ matrix.pre-command }}
 
     - name: Install Briefcase
@@ -132,8 +134,8 @@ jobs:
     - name: Package
       run: briefcase package ${{ matrix.briefcase-target }} --update --adhoc-sign
 
-    - name: Upload logs
-      uses: actions/upload-artifact@v3.1.3
+    - name: Upload Logs
+      uses: actions/upload-artifact@v4.3.4
       if: failure()
       with:
         name: build-failure-logs-${{ matrix.backend }}-${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: "^(attic|examples/.template|nursery)/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-toml
       - id: check-yaml
@@ -10,20 +10,20 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         additional_dependencies: [toml]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.16.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.2
     hooks:
     - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.1.0
     hooks:
       - id: flake8

pyproject.toml

@@ -66,57 +66,9 @@ system_runtime_requires = [
     "libcanberra-gtk3-module",
 ]
 
-[tool.briefcase.app.testbed.linux.appimage]
-manylinux = "manylinux_2_28"
-requires = [
-    '--no-binary', ':all:',
-]
-
-system_requires = [
-    # Needed to compile pycairo wheel
-    "cairo-gobject-devel",
-    # Needed to compile PyGObject wheel
-    "gobject-introspection-devel",
-    # Needed to provide GTK
-    "gtk3-devel",
-    # Dependencies that GTK looks for at runtime, that need to be
-    # in the build environment to be picked up by linuxdeploy
-    "libcanberra-gtk3",
-    "PackageKit-gtk3-module",
-    "gvfs-client",
-    # Needed to compile Pillow
-    "libjpeg-devel",
-    # Needed to compile Cryptography
-    "openssl-devel",
-]
-
-linuxdeploy_plugins = [
-    'DEPLOY_GTK_VERSION=3 gtk',
-]
-
-dockerfile_extra_content = """
-# Install Rust (required for cryptography)
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-# Set up compilers (required for numpy)
-ENV CXX="g++ -pthread"
-ENV AR=ar
-# Add a symlink for python->python3 (needed for pandas)
-# Pandas *requires* that the Python binary be called `python`, not `python3`.
-# However, Python-standalone *only* provides `python3`, and at runtime, we
-# only need `python3`. We can't (easily) reconfigure the Meson build for Pandas,
-# so we put a symlink in `brutus`'s bin path.
-RUN mkdir -p /home/brutus/bin
-RUN ln -si /app/Testbed.AppDir/usr/python/bin/python3 /home/brutus/bin/python
-# Set the path to include all the things we've installed.
-ENV PATH="/home/brutus/bin:/home/brutus/.cargo/bin:${PATH}"
-"""
-
-# support_package = "../Python-linux-support/dist/Python-3.10-linux-x86_64-support.custom.tar.gz"
-# template = "../../templates/briefcase-linux-appimage-template"
-
 [tool.briefcase.app.testbed.linux.flatpak]
 flatpak_runtime = "org.gnome.Platform"
-flatpak_runtime_version = "44"
+flatpak_runtime_version = "45"
 flatpak_sdk = "org.gnome.Sdk"
 
 # template = "../../templates/briefcase-linux-flatpak-template"
@@ -145,7 +97,6 @@ requires = [
 
 [tool.briefcase.app.testbed.android]
 requires = [
-    "rubicon-java",
     # Android doesn't provide the zoneinfo TZ database; use the Python provided one
     "tzdata",
 ]

tests/test_common.py

@@ -116,7 +116,6 @@ def test_stdlib_modules():
     # Modules that do not exist on Android
     if hasattr(sys, "getandroidapilevel"):
         all_modules.remove("grp")
-        all_modules.remove("_crypt")
 
     # Modules that do not exist on iOS
     if sys.platform == "ios":
@@ -127,7 +126,6 @@ def test_stdlib_modules():
 
     # Modules that do not exist on Windows
     if sys.platform == "win32":
-        all_modules.remove("_crypt")
         all_modules.remove("_posixsubprocess")
         all_modules.remove("fcntl")
         all_modules.remove("grp")