fixed overrides

flatironinstitute · Feb 25, 2025 · 167094f · 167094f
1 parent 83a610d
commit 167094f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build_finufft_wheels.yml b/.github/workflows/build_finufft_wheels.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build finufft wheels on ${{ matrix.buildplat[0] }}
     runs-on: ${{ matrix.buildplat[0] }}
     strategy:
-      fail-fast: false
+#      fail-fast: false
       matrix:
         buildplat:
           - [ ubuntu-22.04, manylinux_x86_64 ]

diff --git a/python/finufft/pyproject.toml b/python/finufft/pyproject.toml
@@ -92,18 +92,18 @@ manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
 
-[[tool.cibuildwheel.overrides]]
-select = "cp310-*"
-# Use manylinux_2_28 for Python 3.10 to get GCC 14
-manylinux-x86_64-image = "manylinux_2_28"
-musllinux-x86_64-image = "musllinux_1_2"
-
 [tool.cibuildwheel.windows]
 before-build = "pip install delvewheel"
 # CIBW doesn't do vendoring of DLLs on Windows by default, so we have to
 # install delvewheel and run it.
 repair-wheel-command = "delvewheel repair -v --analyze-existing -w {dest_dir} {wheel}"
-[tool.cibuildwheel.overrides]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp310-*"
+manylinux-x86_64-image = "manylinux_2_28"
+musllinux-x86_64-image = "musllinux_1_2"
+
+# Override for ARM64 builds
+[[tool.cibuildwheel.overrides]]
 select = "*arm64*"
-# Don't enforce x84_64 when building on arm64.
-config-settings = {"cmake.define.FINUFFT_ARCH_FLAGS" = "", "cmake.define.CMAKE_VERBOSE_MAKEFILE" = "ON"}
+config-settings = { "cmake.define.FINUFFT_ARCH_FLAGS" = "", "cmake.define.CMAKE_VERBOSE_MAKEFILE" = "ON" }