Skip to content

Commit 40fd86c

Browse files
authored
MAINT: sync fixes accumulated during the v2.3.3 release process (#10)
* MAINT: update OpenBLAS to 0.3.30.0.1 (cherry picked from commit 6af445c) * MAINT: update delvewheel, Cython, meson to latest versions (cherry picked from commit 0199f2c) * CI: use `merge-multiple` to ensure downloaded artifacts are in one dir (cherry picked from commit a8afeac) * CI: ensure the sdist version built is correct (cherry picked from commit 8621c13)
1 parent 4793c48 commit 40fd86c

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/wheels.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ jobs:
201201
with:
202202
repository: numpy/numpy
203203
submodules: true
204+
ref: ${{ env.SOURCE_REF_TO_BUILD }}
204205
persist-credentials: false
205206

206207
- name: Build sdist
@@ -235,6 +236,7 @@ jobs:
235236
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
236237
with:
237238
path: dist
239+
merge-multiple: true
238240

239241
- name: Remove wasm wheels
240242
run: |
@@ -296,6 +298,7 @@ jobs:
296298
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
297299
with:
298300
path: dist
301+
merge-multiple: true
299302

300303
- name: Remove wasm wheels
301304
run: |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
delvewheel==1.10.1 ; sys_platform == 'win32'
1+
delvewheel==1.11.1 ; sys_platform == 'win32'
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
scipy-openblas32==0.3.29.265.0 ; sys_platform == 'win32' and platform_machine == 'ARM64'
2-
# Note there is not yet a win-arm64 wheel, so we currently only exclude win-arm64
3-
scipy-openblas64==0.3.29.0.0 ; sys_platform != 'win32' or platform_machine != 'ARM64'
1+
scipy-openblas32==0.3.30.0.1
2+
scipy-openblas64==0.3.30.0.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Cython==3.1.2
1+
Cython==3.1.3
22
setuptools==65.5.1 ; python_version < '3.12'
33
setuptools==80.9.0 ; python_version >= '3.12'
44
hypothesis==6.104.1
55
pytest==7.4.0
6-
meson==1.8.2
6+
meson==1.9.0
77
ninja==1.11.1.4; sys_platform != "emscripten"
88
pytest-xdist==3.8.0
99
threadpoolctl==3.6.0

0 commit comments

Comments
 (0)