From d0983dec1588ed706487e1a70a8cdd858b230354 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Wed, 15 Oct 2025 09:38:23 +0100 Subject: [PATCH 1/3] CI: update trusted publishing action to 1.13.0 --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2067a6a..1e321fc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -246,7 +246,7 @@ jobs: ls -al - name: Publish - uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 + uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0 with: repository-url: https://test.pypi.org/legacy/ skip-existing: true @@ -308,7 +308,7 @@ jobs: ls -al - name: Publish - uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4 + uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0 with: print-hash: true attestations: true From e0cb6aeed6a6cec534008b7ab72ecb27c31f7c01 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Wed, 15 Oct 2025 09:44:20 +0100 Subject: [PATCH 2/3] MAINT: bump build (cython, openblas) and test (cython, meson) deps --- requirements/delvewheel_requirements.txt | 2 +- requirements/openblas_requirements.txt | 4 ++-- requirements/wheel_test_requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/delvewheel_requirements.txt b/requirements/delvewheel_requirements.txt index d618271..7058ed7 100644 --- a/requirements/delvewheel_requirements.txt +++ b/requirements/delvewheel_requirements.txt @@ -1 +1 @@ -delvewheel==1.11.1 ; sys_platform == 'win32' +delvewheel==1.11.2 ; sys_platform == 'win32' diff --git a/requirements/openblas_requirements.txt b/requirements/openblas_requirements.txt index 0ab5c0b..11f22ce 100644 --- a/requirements/openblas_requirements.txt +++ b/requirements/openblas_requirements.txt @@ -1,2 +1,2 @@ -scipy-openblas32==0.3.30.0.1 -scipy-openblas64==0.3.30.0.1 +scipy-openblas32==0.3.30.0.2 +scipy-openblas64==0.3.30.0.2 diff --git a/requirements/wheel_test_requirements.txt b/requirements/wheel_test_requirements.txt index f9592f9..4ebf539 100644 --- a/requirements/wheel_test_requirements.txt +++ b/requirements/wheel_test_requirements.txt @@ -1,9 +1,9 @@ -Cython==3.1.3 +Cython==3.1.4 setuptools==65.5.1 ; python_version < '3.12' setuptools==80.9.0 ; python_version >= '3.12' hypothesis==6.104.1 pytest==7.4.0 -meson==1.9.0 +meson==1.9.1 ninja==1.11.1.4; sys_platform != "emscripten" pytest-xdist==3.8.0 threadpoolctl==3.6.0 From e1c8b292ab8bb951c28ae5f4c320377640d710ac Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Wed, 15 Oct 2025 10:05:49 +0100 Subject: [PATCH 3/3] BLD: build macOS x86-64 wheels on macOS 15, stop using deprecated macos-13 Similar to the change in numpy#29886 --- .github/workflows/wheels.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1e321fc..5b6acb2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,10 +52,10 @@ jobs: - [ubuntu-22.04, musllinux_x86_64, ""] - [ubuntu-22.04-arm, manylinux_aarch64, ""] - [ubuntu-22.04-arm, musllinux_aarch64, ""] - - [macos-13, macosx_x86_64, openblas] + - [macos-15-intel, macosx_x86_64, openblas] # targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile - - [macos-13, macosx_x86_64, accelerate] + - [macos-15-intel, macosx_x86_64, accelerate] - [macos-14, macosx_arm64, openblas] - [macos-14, macosx_arm64, accelerate] - [windows-2022, win_amd64, ""] @@ -74,9 +74,9 @@ jobs: python: "pp311" - buildplat: [ ubuntu-22.04-arm, musllinux_aarch64, "" ] python: "pp311" - - buildplat: [ macos13, macosx_x86_64, openblas ] + - buildplat: [ macos-15-intel, macosx_x86_64, openblas ] python: "cp313t" - - buildplat: [ macos13, macosx_x86_64, openblas ] + - buildplat: [ macos-15-intel, macosx_x86_64, openblas ] python: "cp314t" include: - buildplat: [ ubuntu-22.04, pyodide_wasm32, "" ] @@ -122,7 +122,7 @@ jobs: echo "CIBW_ENVIRONMENT_WINDOWS=PKG_CONFIG_PATH=$CIBW" >> $env:GITHUB_ENV - name: Setup macOS - if: matrix.buildplat[0] == 'macos-13' || matrix.buildplat[0] == 'macos-14' + if: startsWith(matrix.buildplat[0], 'macos') run: | # Needed due to https://github.com/actions/runner-images/issues/3371 # Supported versions: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md @@ -133,10 +133,6 @@ jobs: if [[ ${{ matrix.buildplat[2] }} == 'accelerate' ]]; then # Builds with Accelerate only target macOS>=14.0 echo "CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET=14.0 INSTALL_OPENBLAS=false" >> "$GITHUB_ENV" - - # the macos-13 image that's used for building the x86_64 wheel can't test - # a wheel with deployment target >= 14 without further work - echo "CIBW_TEST_SKIP=*-macosx_x86_64" >> "$GITHUB_ENV" else echo "CIBW_ENVIRONMENT_MACOS=PKG_CONFIG_PATH=$PWD/.openblas" >> "$GITHUB_ENV" fi