pyproject.toml: Move settings of CIBW_BEFORE_ALL_WINDOWS and CIBW_BEFORE_BUILD_WINDOWS here

Author: mkoeppe

.github/workflows/buildwheel.yml

@@ -36,6 +36,7 @@ jobs:
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          # override setting in pyproject.toml to use msys2 instead of msys64 bash
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
           CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_windows.sh
 

bin/cibw.bat

@@ -24,7 +24,4 @@ del /q wheelhouse\*
 rem override setting in pyproject.toml
 set CIBW_BUILD=cp39-* cp310-* cp311-*
 
-set CIBW_BEFORE_ALL_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_all_windows.sh
-set CIBW_BEFORE_BUILD_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_build_windows.sh
-
 cibuildwheel --platform windows

bin/cibw.sh

@@ -11,10 +11,6 @@ rm -f wheelhouse/*
 # export CIBW_ARCHS_MACOS="x86_64"
 export CIBW_ARCHS_MACOS="arm64"
 
-export CIBW_BEFORE_ALL_WINDOWS='C:\\msys64\\usr\\bin\\bash bin/cibw_before_all_windows.sh'
-
-export CIBW_BEFORE_BUILD_WINDOWS='pip install delvewheel && C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh'
-
 export CIBW_TEST_COMMAND="python -m flint.test"  # override setting in pyproject.toml
 
 # cibuildwheel --platform linux

pyproject.toml

@@ -39,6 +39,8 @@ before-all = "bin/cibw_before_all_linux.sh"
 before-all = "bin/cibw_before_all_macosx_$(uname -m).sh"
 
 [tool.cibuildwheel.windows]
+before-all = "C:\\msys64\\usr\\bin\\bash bin/cibw_before_all_windows.sh"
+before-build = "pip install delvewheel && C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh"
 repair-wheel-command = "bin\\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}"
 
 [tool.cibuildwheel.windows.environment]