Merge branch 'main' into ios-test-command-change

Author: joerick

.circleci/config.yml

@@ -1,24 +1,41 @@
-version: 2
+version: 2.1
+
+commands:
+  cibw_prepare_environment:
+    description: "Prepare the environment for testing."
+    steps:
+      - run:
+          name: Prepare the environment.
+          command: bash .circleci/prepare.sh
+  cibw_run_tests:
+    description: "Runs tests, with CIBW_ENABLE=all on the main branch"
+    steps:
+      - run:
+          name: Test
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
+              echo "INFO: Exporting CIBW_ENABLE=all for main branch test run."
+              export CIBW_ENABLE=all
+            else
+              echo "INFO: CIBW_ENABLE not set for this branch test run."
+            fi
+
+            venv/bin/python ./bin/run_tests.py
+          no_output_timeout: 30m
 
 jobs:
-  osx-python3.12:
+  osx-python312:
     macos:
       xcode: 15.4.0
     resource_class: macos.m1.medium.gen1
     environment:
       PYTHON: python3
     steps:
       - checkout
+      - cibw_prepare_environment
+      - cibw_run_tests
 
-      - run:
-          name: Prepare the environment.
-          command: bash .circleci/prepare.sh
-      - run:
-          name: Test.
-          command: venv/bin/python ./bin/run_tests.py
-          no_output_timeout: 30m
-
-  linux-python3.12:
+  linux-python312:
     docker:
       - image: cimg/python:3.12
     environment:
@@ -29,14 +46,8 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
-
-      - run:
-          name: Prepare the environment.
-          command: bash .circleci/prepare.sh
-      - run:
-          name: Test.
-          command: venv/bin/python ./bin/run_tests.py
-          no_output_timeout: 30m
+      - cibw_prepare_environment
+      - cibw_run_tests
 
   linux-aarch64:
     machine:
@@ -49,19 +60,13 @@ jobs:
       PYTEST_ADDOPTS: -k "unit_test or main_tests or test_0_basic or test_docker_images"
     steps:
       - checkout
-
-      - run:
-          name: Prepare the environment.
-          command: bash .circleci/prepare.sh
-      - run:
-          name: Test.
-          command: venv/bin/python ./bin/run_tests.py
-          no_output_timeout: 30m
+      - cibw_prepare_environment
+      - cibw_run_tests
 
 workflows:
   version: 2
   all-tests:
     jobs:
-      - osx-python3.12
-      - linux-python3.12
+      - osx-python312
+      - linux-python312
       - linux-aarch64

.cirrus.yml

@@ -62,7 +62,7 @@ windows_x86_task:
 
 macos_arm64_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:sonoma
+    image: ghcr.io/cirruslabs/macos-runner:sequoia
   env:
     VENV_ROOT: ${HOME}/venv-cibuildwheel
     PATH: ${VENV_ROOT}/bin:${PATH}
@@ -73,11 +73,11 @@ macos_arm64_task:
 
 macos_arm64_cp38_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:sonoma
+    image: ghcr.io/cirruslabs/macos-runner:sequoia
   env:
     VENV_ROOT: ${HOME}/venv-cibuildwheel
     PATH: ${VENV_ROOT}/bin:${PATH}
-    PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto'
+    PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto or test_dummy_serial'
   install_pre_requirements_script:
     - brew install python@3.12
     - python3.12 -m venv ${VENV_ROOT}

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         path: dist
 
     - name: Generate artifact attestation for sdist and wheel
-      uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+      uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
       with:
         subject-path: "dist/cibuildwheel-*"
 

.github/workflows/test.yml

@@ -6,6 +6,11 @@ on:
       - main
       - 2.x
   pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
     paths-ignore:
       - 'docs/**'
       - .pre-commit-config.yaml
@@ -36,7 +41,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-15]
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-15]
         python_version: ['3.13']
         include:
         - os: ubuntu-latest
@@ -50,7 +55,7 @@ jobs:
         python-version: ${{ matrix.python_version }}
         allow-prereleases: true
 
-    - uses: astral-sh/setup-uv@v5
+    - uses: astral-sh/setup-uv@v6
 
     # free some space to prevent reaching GHA disk space limits
     - name: Clean docker images
@@ -68,9 +73,29 @@ jobs:
       run: |
         uv sync --no-dev --group test
 
+    - uses: joerick/pr-labels-action@v1.0.9
+    - name: Set CIBW_ENABLE
+      shell: bash
+      run: |
+        if [[ "${{ github.ref_name }}" == "main" ]]; then
+          CIBW_ENABLE=all
+        else
+          # get the default CIBW_ENABLE value from the test module
+          CIBW_ENABLE=$(uv run --no-sync python -c 'import sys, test.conftest as c; sys.stdout.write(c.DEFAULT_CIBW_ENABLE)')
+
+          # if this is a PR, check for labels
+          if [[ -n "$GITHUB_PR_LABEL_CI_PYPY" ]]; then
+            CIBW_ENABLE+=" pypy"
+          fi
+          if [[ -n "$GITHUB_PR_LABEL_CI_GRAALPY" ]]; then
+            CIBW_ENABLE+=" graalpy"
+          fi
+        fi
+        echo "CIBW_ENABLE=${CIBW_ENABLE}" >> $GITHUB_ENV
+
     - name: Generate a sample project
       run: |
-        uv run -m test.test_projects test.test_0_basic.basic_project sample_proj
+        uv run --no-sync -m test.test_projects test.test_0_basic.basic_project sample_proj
 
     - name: Run a sample build (GitHub Action)
       uses: ./
@@ -80,7 +105,6 @@ jobs:
       env:
         CIBW_ARCHS_MACOS: x86_64 universal2 arm64
         CIBW_BUILD_FRONTEND: 'build[uv]'
-        CIBW_ENABLE: "cpython-prerelease cpython-freethreading pypy"
 
     - name: Run a sample build (GitHub Action, only)
       uses: ./
@@ -122,7 +146,7 @@ jobs:
 
     - name: Test cibuildwheel
       run: |
-        uv run bin/run_tests.py ${{ (runner.os == 'Linux' && runner.arch == 'X64') && '--run-podman' || '' }}
+        uv run --no-sync bin/run_tests.py ${{ (runner.os == 'Linux' && runner.arch == 'X64') && '--run-podman' || '' }}
 
   emulated-archs:
     name: Get qemu emulated architectures
@@ -135,13 +159,13 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
-    - uses: astral-sh/setup-uv@v5
+    - uses: astral-sh/setup-uv@v6
     - name: Install dependencies
       run: uv sync --no-dev --group test
     - name: Get qemu emulated architectures
       id: archs
       run: |
-        OUTPUT=$(uv run python -c "from json import dumps; from test.utils import EMULATED_ARCHS; print(dumps(EMULATED_ARCHS))")
+        OUTPUT=$(uv run --no-sync python -c "from json import dumps; from test.utils import EMULATED_ARCHS; print(dumps(EMULATED_ARCHS))")
         echo "${OUTPUT}"
         echo "archs=${OUTPUT}" >> "$GITHUB_OUTPUT"
 
@@ -158,15 +182,15 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
-    - uses: astral-sh/setup-uv@v5
+    - uses: astral-sh/setup-uv@v6
     - name: Install dependencies
       run: uv sync --no-dev --group test
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
     - name: Run the emulation tests
-      run: uv run pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py
+      run: uv run --no-sync pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py
 
   test-pyodide:
     name: Test cibuildwheel building Pyodide wheels
@@ -179,14 +203,14 @@ jobs:
       name: Install Python 3.12
       with:
         python-version: '3.12'
-    - uses: astral-sh/setup-uv@v5
+    - uses: astral-sh/setup-uv@v6
 
     - name: Install dependencies
       run: uv sync --no-dev --group test
 
     - name: Generate a sample project
       run: |
-        uv run -m test.test_projects test.test_0_basic.basic_project sample_proj
+        uv run --no-sync -m test.test_projects test.test_0_basic.basic_project sample_proj
 
     - name: Run a sample build (GitHub Action)
       uses: ./
@@ -198,6 +222,6 @@ jobs:
 
     - name: Run tests with 'CIBW_PLATFORM' set to 'pyodide'
       run: |
-        uv run ./bin/run_tests.py
+        uv run --no-sync ./bin/run_tests.py
       env:
         CIBW_PLATFORM: pyodide

.github/workflows/update-dependencies.yml

@@ -32,7 +32,7 @@ jobs:
 
     - uses: actions/checkout@v4
 
-    - uses: wntrblm/nox@2025.02.09
+    - uses: wntrblm/nox@2025.05.01
 
     - name: "Run update: dependencies"
       run: nox --force-color -s update_constraints

.gitlab-ci.yml

@@ -13,6 +13,10 @@ linux:
     # skip all but the basic tests
     # (comment the below line in a PR to debug a Gitlab-specific issue)
     PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+      variables:
+        CIBW_ENABLE: "all"
   script:
     - curl -sSL https://get.docker.com/ | sh
     - docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all
@@ -26,6 +30,10 @@ windows:
     PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code
   before_script:
     - choco install python -y --version 3.12.4
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+      variables:
+        CIBW_ENABLE: "all"
   script:
     - py -m pip install dependency-groups
     - py -m pip install -e. pytest-custom-exit-code $(py -m dependency_groups test)
@@ -37,6 +45,10 @@ macos:
   image: macos-14-xcode-15
   variables:
     PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+      variables:
+        CIBW_ENABLE: "all"
   script:
     - python3 -m pip install dependency-groups
     - python3 -m dependency_groups test | xargs python3 -m pip install -e. pytest-custom-exit-code

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.4
+  rev: v0.11.8
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
@@ -25,7 +25,6 @@ repos:
   hooks:
   - id: mypy
     name: mypy 3.11 on cibuildwheel/
-    exclude: ^cibuildwheel/resources/.*py$
     args: ["--python-version=3.11"]
     additional_dependencies: &mypy-dependencies
       - bracex
@@ -81,7 +80,7 @@ repos:
 
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.32.1
+  rev: 0.33.0
   hooks:
     - id: check-dependabot
     - id: check-github-actions

.travis.yml

@@ -14,13 +14,17 @@ jobs:
     - name: Linux | x86_64 + i686 | Python 3.12
       python: 3.12
       services: docker
-      env: PYTHON=python
+      env:
+        - PYTHON=python
+        - CIBW_ENABLE=all
 
     - name: Linux | arm64 | Python 3.12
       python: 3.12
       services: docker
       arch: arm64
-      env: PYTHON=python
+      env:
+        - PYTHON=python
+        - CIBW_ENABLE=all
 
     - name: Linux | ppc64le | Python 3.12
       python: 3.12
@@ -32,6 +36,7 @@ jobs:
         # skip test_manylinuxXXXX_only, it uses too much disk space
         # c.f. https://travis-ci.community/t/running-out-of-disk-space-quota-when-using-docker-on-ppc64le/11634
         - PYTEST_ADDOPTS='-k "not test_manylinuxXXXX_only"'
+        - CIBW_ENABLE=all
 
     - name: Windows | x86_64 | Python 3.12
       os: windows
@@ -40,13 +45,16 @@ jobs:
         - choco upgrade python3 -y --version 3.12.8 --limit-output --params "/InstallDir:C:\\Python312"
       env:
         - PYTHON=C:\\Python312\\python
+        - CIBW_ENABLE=all
 
     - name: Linux | s390x | Python 3.12
       python: 3.12
       services: docker
       arch: s390x
       allow_failure: True
-      env: PYTHON=python
+      env:
+        - PYTHON=python
+        - CIBW_ENABLE=all
 
 install:
 - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all; fi