minor cleanups

Author: rgommers

cibuildwheel.toml

@@ -1,8 +1,6 @@
 [tool.cibuildwheel]
 # Note: the below skip command doesn't do much currently, the platforms to
-# build wheels for in CI are controlled in `.github/workflows/wheels.yml` and
-# `tools/ci/cirrus_wheels.yml`.
-build-frontend = "build"
+# build wheels for in CI are controlled in `.github/workflows/wheels.yml`.
 skip = ["*_i686", "*_ppc64le", "*_s390x", "*_universal2"]
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 before-test = "pip install -r {project}/requirements/wheel_test_requirements.txt"
@@ -21,16 +19,15 @@ musllinux-x86_64-image = "musllinux_1_2"
 musllinux-aarch64-image = "musllinux_1_2"
 
 [tool.cibuildwheel.linux.environment]
-# RUNNER_OS is a GitHub Actions specific env var; define it here so it works on Cirrus CI too
+# RUNNER_OS is a GitHub Actions specific env var; define it here so it's
+# defined when running cibuildwheel locally
 RUNNER_OS="Linux"
-# /project will be the $PWD equivalent inside the docker used to build the wheel
+# /project will be the $PWD equivalent inside the Docker container used to build the wheel
 PKG_CONFIG_PATH="/project/.openblas"
 LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/project/.openblas/lib"
 
 [tool.cibuildwheel.macos]
 # universal2 wheels are not supported (see gh-21233), use `delocate-fuse` if you need them
-# note that universal2 wheels are not built, they're listed in the tool.cibuildwheel.skip
-# section
 # Not clear why the DYLD_LIBRARY_PATH is not passed through from the environment
 repair-wheel-command = [
   "export DYLD_LIBRARY_PATH=$PWD/.openblas/lib",
@@ -41,8 +38,6 @@ repair-wheel-command = [
 [tool.cibuildwheel.windows]
 config-settings = {setup-args = ["--vsenv", "-Dallow-noblas=false"], build-dir="build"}
 repair-wheel-command = "bash -el ./tools/wheels/repair_windows.sh {wheel} {dest_dir}"
-# This does not work, use CIBW_ENVIRONMENT_WINDOWS
-environment = {PKG_CONFIG_PATH="./.openblas"}
 
 [[tool.cibuildwheel.overrides]]
 select = ["*-win32"]

tools/wheels/cibw_before_build.sh

@@ -4,9 +4,6 @@ PROJECT_DIR="${1:-$PWD}"
 NUMPY_SRC_DIR="${1:-$PWD}/numpy-src"
 
 
-# remove any cruft from a previous run
-rm -rf build
-
 # Update license
 echo "" >> $NUMPY_SRC_DIR/LICENSE.txt
 echo "----" >> $NUMPY_SRC_DIR/LICENSE.txt
@@ -28,29 +25,25 @@ elif [ -z $INSTALL_OPENBLAS ]; then
     export INSTALL_OPENBLAS=true
 fi
 
-# Install Openblas from scipy-openblas64
+# Install OpenBLAS from scipy-openblas64
 if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
-    # by default, use scipy-openblas64
+    # By default, use scipy-openblas64
+    # On 32-bit platforms and on win-arm64, use scipy-openblas32
     OPENBLAS=openblas64
-    # Possible values for RUNNER_ARCH in github are
-    # X86, X64, ARM, or ARM64
-    # TODO: should we detect a missing RUNNER_ARCH and use platform.machine()
-    #    when wheel build is run outside github?
-    # On 32-bit platforms, use scipy_openblas32
-    # On win-arm64 use scipy_openblas32
+    # Possible values for RUNNER_ARCH in GitHub Actions are: X86, X64, ARM, or ARM64
     if [[ $RUNNER_ARCH == "X86" || $RUNNER_ARCH == "ARM" ]] ; then
         OPENBLAS=openblas32
     elif [[ $RUNNER_ARCH == "ARM64" && $RUNNER_OS == "Windows" ]] ; then
         OPENBLAS=openblas32
     fi
-    echo PKG_CONFIG_PATH is $PKG_CONFIG_PATH, OPENBLAS is ${OPENBLAS}
     PKG_CONFIG_PATH=$PROJECT_DIR/.openblas
+    echo PKG_CONFIG_PATH is $PKG_CONFIG_PATH, OPENBLAS is ${OPENBLAS}
     rm -rf $PKG_CONFIG_PATH
     mkdir -p $PKG_CONFIG_PATH
     python -m pip install -r $PROJECT_DIR/requirements/openblas_requirements.txt
     python -c "import scipy_${OPENBLAS}; print(scipy_${OPENBLAS}.get_pkg_config())" > $PKG_CONFIG_PATH/scipy-openblas.pc
     # Copy the shared objects to a path under $PKG_CONFIG_PATH, the build
-    # will point $LD_LIBRARY_PATH there and then auditwheel/delocate-wheel will
+    # will point $LD_LIBRARY_PATH there and then auditwheel/delocate will
     # pull these into the wheel. Use python to avoid windows/posix problems
     python <<EOF
 import os, scipy_${OPENBLAS}, shutil
@@ -62,7 +55,9 @@ if os.path.exists(srcdir):  # macosx delocate
 EOF
     # pkg-config scipy-openblas --print-provides
 fi
+
+# cibuildwheel doesn't install delvewheel by default (it does install
+# auditwheel on Linux and delocate on macOS)
 if [[ $RUNNER_OS == "Windows" ]]; then
-    # delvewheel is the equivalent of delocate/auditwheel for windows.
-    python -m pip install delvewheel wheel
+    python -m pip install delvewheel
 fi

tools/wheels/cibw_test_command.sh

@@ -7,7 +7,7 @@ PROJECT_DIR="$1"
 python -c "import numpy; numpy.show_config()"
 
 if [[ $RUNNER_OS == "Windows" ]]; then
-    # GH 20391
+    # see gh-20391
     PY_DIR=$(python -c "import sys; print(sys.prefix)")
     mkdir $PY_DIR/libs
 fi
@@ -23,8 +23,8 @@ elif [[ $RUNNER_OS == "Windows" && $IS_32_BIT == true ]] ; then
   # Avoid this in GHA: "ERROR: Found GNU link.exe instead of MSVC link.exe"
   rm /c/Program\ Files/Git/usr/bin/link.EXE
 fi
-# Set available memory value to avoid OOM problems on aarch64.
-# See gh-22418.
+
+# Set available memory value to avoid OOM problems on aarch64 (see gh-22418)
 export NPY_AVAILABLE_MEM="4 GB"
 
 FREE_THREADED_BUILD="$(python -c"import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
@@ -42,4 +42,6 @@ fi
 # the available N CPU cores. Also print the durations for the 10 slowest tests
 # to help with debugging slow or hanging tests
 python -c "import sys; import numpy; sys.exit(not numpy.test(label='full', extra_argv=['-n=auto', '--durations=10']))"
+
+# Check license file content
 python $PROJECT_DIR/tools/wheels/check_license.py