From 7c7bf82a93a642494820871d1055d9d9d58b8e70 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Mon, 8 Sep 2025 21:09:52 +0200 Subject: [PATCH 1/4] MAINT: update OpenBLAS to 0.3.30.0.1 (cherry picked from commit 6af445cbd9ecc672a9dd2e9c324a542c18f4abac) --- requirements/openblas_requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements/openblas_requirements.txt b/requirements/openblas_requirements.txt index 90270cd..0ab5c0b 100644 --- a/requirements/openblas_requirements.txt +++ b/requirements/openblas_requirements.txt @@ -1,3 +1,2 @@ -scipy-openblas32==0.3.29.265.0 ; sys_platform == 'win32' and platform_machine == 'ARM64' -# Note there is not yet a win-arm64 wheel, so we currently only exclude win-arm64 -scipy-openblas64==0.3.29.0.0 ; sys_platform != 'win32' or platform_machine != 'ARM64' +scipy-openblas32==0.3.30.0.1 +scipy-openblas64==0.3.30.0.1 From d67b76a2215162220939b5cf3382e75a6cfc2c7e Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Mon, 8 Sep 2025 21:21:06 +0200 Subject: [PATCH 2/4] MAINT: update delvewheel, Cython, meson to latest versions (cherry picked from commit 0199f2c7a4f66e5ae099d0d55b76747c9dcd06b3) --- requirements/delvewheel_requirements.txt | 2 +- requirements/wheel_test_requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/delvewheel_requirements.txt b/requirements/delvewheel_requirements.txt index 6fd6e86..d618271 100644 --- a/requirements/delvewheel_requirements.txt +++ b/requirements/delvewheel_requirements.txt @@ -1 +1 @@ -delvewheel==1.10.1 ; sys_platform == 'win32' +delvewheel==1.11.1 ; sys_platform == 'win32' diff --git a/requirements/wheel_test_requirements.txt b/requirements/wheel_test_requirements.txt index b5be2ff..f9592f9 100644 --- a/requirements/wheel_test_requirements.txt +++ b/requirements/wheel_test_requirements.txt @@ -1,9 +1,9 @@ -Cython==3.1.2 +Cython==3.1.3 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.8.2 +meson==1.9.0 ninja==1.11.1.4; sys_platform != "emscripten" pytest-xdist==3.8.0 threadpoolctl==3.6.0 From 4ef252032f9075078ddaaf85a2c369ccc13c3873 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Tue, 9 Sep 2025 15:09:18 +0200 Subject: [PATCH 3/4] CI: use `merge-multiple` to ensure downloaded artifacts are in one dir (cherry picked from commit a8afeac8b5e22ca054e8d4db878e70fa33c01d30) --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5ff5c94..23488a1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -235,6 +235,7 @@ jobs: uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: path: dist + merge-multiple: true - name: Remove wasm wheels run: | @@ -296,6 +297,7 @@ jobs: uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: path: dist + merge-multiple: true - name: Remove wasm wheels run: | From 9738833bea439b9e453a198e018fae99bb735660 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Tue, 9 Sep 2025 18:05:32 +0200 Subject: [PATCH 4/4] CI: ensure the sdist version built is correct (cherry picked from commit 8621c134ecb4d90f77defbae1e41d5f12054cd08) --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 23488a1..45008d9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -201,6 +201,7 @@ jobs: with: repository: numpy/numpy submodules: true + ref: ${{ env.SOURCE_REF_TO_BUILD }} persist-credentials: false - name: Build sdist