Merge pull request #22921 from charris/test-latest-cibuildwheel

BLD: Try building wheels with cibuildwheel 2.12.0
numpy · Jan 17, 2023 · 5e96301 · 5e96301
2 parents 6539741 + 57c6154
commit 5e96301
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -111,13 +111,12 @@ jobs:
       - name: setup rtools for 32-bit
         run: |
           echo "PLAT=i686" >> $env:GITHUB_ENV
-          echo "MSYSTEM=MINGW32" >> $env:GITHUB_ENV
           echo "PATH=$env:RTOOLS40_HOME\mingw32\bin;$env:PATH" >> $env:GITHUB_ENV
           gfortran --version
         if: ${{ matrix.buildplat[1] == 'win32' }}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.2
+        uses: pypa/cibuildwheel@v2.12.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 

diff --git a/numpy/core/src/common/simd/neon/operators.h b/numpy/core/src/common/simd/neon/operators.h
@@ -249,9 +249,9 @@ NPY_FINLINE npyv_b32 npyv_notnan_f32(npyv_f32 a)
  */
     npyv_b32 ret;
     #if NPY_SIMD_F64
-        asm ("fcmeq %0.4s, %1.4s, %1.4s" : "=w" (ret) : "w" (a));
+        __asm("fcmeq %0.4s, %1.4s, %1.4s" : "=w" (ret) : "w" (a));
     #else
-        asm ("vceq.f32 %q0, %q1, %q1" : "=w" (ret) : "w" (a));
+        __asm("vceq.f32 %q0, %q1, %q1" : "=w" (ret) : "w" (a));
     #endif
     return ret;
 #else
@@ -263,7 +263,7 @@ NPY_FINLINE npyv_b32 npyv_notnan_f32(npyv_f32 a)
     {
     #if defined(__clang__)
         npyv_b64 ret;
-        asm ("fcmeq %0.2d, %1.2d, %1.2d" : "=w" (ret) : "w" (a));
+        __asm("fcmeq %0.2d, %1.2d, %1.2d" : "=w" (ret) : "w" (a));
         return ret;
     #else
         return vceqq_f64(a, a);

diff --git a/tools/ci/cirrus_general.yml b/tools/ci/cirrus_general.yml
@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.11.2
+    - python -m pip install cibuildwheel==2.12.0
   cibuildwheel_script:
     - cibuildwheel
   wheels_artifacts: