fix delvewheel invocation, restore dir cleaning [wheel build]

pyproject.toml

@@ -180,7 +180,7 @@ DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/$PWD/.openblas/lib"
 # This does not work, use CIBW_ENVIRONMENT_WINDOWS
 environment = {PKG_CONFIG_PATH="./.openblas"}
 config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=false build-dir=build"
-repair-wheel-command = "bash ./tools/wheels/repair_windows.sh {wheel} {dest_dir}"
+repair-wheel-command = "bash -el ./tools/wheels/repair_windows.sh {wheel} {dest_dir}"
 
 [[tool.cibuildwheel.overrides]]
 select = "*-win32"

tools/ci/cirrus_wheels.yml

@@ -68,7 +68,6 @@ macosx_arm64_task:
         CIBW_BUILD: cp310-* cp311-*
     - env:
         CIRRUS_CLONE_SUBMODULES: true
-        CIBW_PRERELEASE_PYTHONS: True
         CIBW_BUILD: cp312-*
   env:
     PATH: /usr/local/lib:/usr/local/include:$PATH

tools/wheels/cibw_before_build.sh

@@ -31,6 +31,7 @@ fi
 if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
     echo PKG_CONFIG_PATH $PKG_CONFIG_PATH
     PKG_CONFIG_PATH=$PROJECT_DIR/.openblas
+    rm -rf $PKG_CONFIG_PATH
     mkdir -p $PKG_CONFIG_PATH
     python -m pip install scipy-openblas64
     python -c "import scipy_openblas64; print(scipy_openblas64.get_pkg_config())" > $PKG_CONFIG_PATH/scipy-openblas.pc

tools/wheels/repair_windows.sh

@@ -5,6 +5,8 @@ DEST_DIR="$2"
 
 # create a temporary directory in the destination folder and unpack the wheel
 # into there
+cwd=$PWD
+
 pushd $DEST_DIR
 mkdir -p tmp
 pushd tmp
@@ -29,4 +31,4 @@ rm -rf tmp
 
 # the libopenblas.dll is placed into this directory in the cibw_before_build
 # script.
-delvewheel repair --add-path /c/opt/64/bin -w $DEST_DIR $WHEEL
+delvewheel repair --add-path $cwd/.openblas/lib -w $DEST_DIR $WHEEL