Update cibuildwheel configuration for Windows

Refactor Windows environment setup for cibuildwheel.

Author: alexlib

pyproject.toml

@@ -24,11 +24,16 @@ before-all = "yum -y install openblas-devel lapack-devel"
 environment = { EASYSBA_USE_ACCELERATE = "1", EASYSBA_LAPACK_LIBS = "" }
 
 [tool.cibuildwheel.windows]
-# 1. Install scipy-openblas (the lib) and delvewheel (to bundle the DLL)
+# We already installed these on the host, but we install them in the 
+# build venv as well to be safe for the repair step.
 before-build = "pip install scipy-openblas delvewheel"
 
-# 2. Extract paths from scipy-openblas and set them for the compiler
-environment = { EASYSBA_LAPACK_LIBS="openblas", INCLUDE="$(python -c \"import scipy_openblas; print(scipy_openblas.get_include_dir())\");$INCLUDE", LIB="$(python -c \"import scipy_openblas; print(scipy_openblas.get_lib_dir())\");$LIB" }
+[tool.cibuildwheel.windows.environment]
+EASYSBA_LAPACK_LIBS = "openblas"
+# These $(...) commands will now work because scipy-openblas is on the host
+INCLUDE = "$(python -c \"import scipy_openblas; print(scipy_openblas.get_include_dir())\");$INCLUDE"
+LIB = "$(python -c \"import scipy_openblas; print(scipy_openblas.get_lib_dir())\");$LIB"
 
-# 3. Repair the wheel: this bundles openblas.dll into the .whl file
+[tool.cibuildwheel.windows.repair-wheel-command]
+# Use the repair-wheel-command to bundle the DLL
 repair-wheel-command = "delvewheel repair --add-path $(python -c \"import scipy_openblas; print(scipy_openblas.get_lib_dir())\") -w {dest_dir} {wheel}"