wheels: Use normal delvewheel command

Author: oscarbenjamin

bin/cibw_before_build_windows.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+#
+# This script was previously needed to make libpythonXX.a on Windows when using
+# MinGW and setuptools. This is no longer needed now that we use meson.
+#
+
 set -o errexit
 
 # Uncomment this to run cibuildwheel locally on Windows:
@@ -28,15 +33,13 @@ echo ---------------------------------------------------
 #  Find pythonXX.dll and make a .a library        #
 ###################################################
 
-# XXX: Maybe this is not necessary any more with meson?
+cd $homepath
+gendef python${VER}.dll
+dlltool --dllname python${VER}.dll 	\
+	--def python${VER}.def 		\
+	--output-lib libpython${VER}.a
 
-#cd $homepath
-#gendef python${VER}.dll
-#dlltool --dllname python${VER}.dll 	\
-#	--def python${VER}.def 		\
-#	--output-lib libpython${VER}.a
-#
-#mv libpython${VER}.a libs
+mv libpython${VER}.a libs
 
 ###################################################
 #  Install build dependencies                     #

bin/cibw_repair_wheel_command_windows.sh

@@ -4,6 +4,12 @@
 #
 # https://github.com/scipy/scipy/blob/main/tools/wheels/repair_windows.sh
 
+#
+# This was previously needed because delvewheel would reject wheels with
+# binaries generated by MinGW unless they had been stripped. This is not needed
+# any more with newer versions of delvewheel.
+#
+
 set -o errexit
 
 # Uncomment this to run cibuildwheel locally on Windows:

pyproject.toml

@@ -90,5 +90,18 @@ 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}"
+before-build = "pip install delvewheel"
+repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"
+
+# Previously with setuptools and MinGW it was necessary to run
+# bin/cibw_before_build_windows.sh before building the wheel to create the
+# libpython*.a files. This is no longer necessary now meson is used:
+#
+#   before-build = "pip install delvewheel && C:\\msys64\\usr\\bin\\bash bin/cibw_before_build_windows.sh"
+#
+# Previously a custom delvewheel command was needed because delvewheel would
+# reject binaries created with MinGW unless they had been stripped. This is not
+# needed any more with newer versions of delvewheel:
+#
+#   repair-wheel-command = "bin\\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}"
+#