MAINT: clean up the messing around with DYLD_LIBRARY_PATH

Also clean up PKG_CONFIG_PATH handling for macOS.

Author: rgommers

.github/workflows/wheels.yml

@@ -112,22 +112,16 @@ jobs:
           echo "FC=gfortran-13" >> "$GITHUB_ENV"
           echo "F77=gfortran-13" >> "$GITHUB_ENV"
           echo "F90=gfortran-13" >> "$GITHUB_ENV"
+
           if [[ ${{ matrix.buildplat[2] }} == 'accelerate' ]]; then
-            # macosx_arm64 and macosx_x86_64 with accelerate
-            # only target Sonoma onwards
-            CIBW="MACOSX_DEPLOYMENT_TARGET=14.0 INSTALL_OPENBLAS=false RUNNER_OS=macOS"
-            echo "CIBW_ENVIRONMENT_MACOS=$CIBW" >> "$GITHUB_ENV"
+            # Builds with Accelerate only target macOS>=14.0
+            echo "CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET=14.0 INSTALL_OPENBLAS=false" >> "$GITHUB_ENV"
 
             # the macos-13 image that's used for building the x86_64 wheel can't test
             # a wheel with deployment target >= 14 without further work
             echo "CIBW_TEST_SKIP=*-macosx_x86_64" >> "$GITHUB_ENV"
           else
-            # macosx_x86_64 with OpenBLAS
-            # if INSTALL_OPENBLAS isn't specified then scipy-openblas is automatically installed
-            CIBW="RUNNER_OS=macOS"
-            PKG_CONFIG_PATH="$PWD/.openblas"
-            DYLD="$DYLD_LIBRARY_PATH:/$PWD/.openblas/lib"
-            echo "CIBW_ENVIRONMENT_MACOS=$CIBW PKG_CONFIG_PATH=$PKG_CONFIG_PATH DYLD_LIBRARY_PATH=$DYLD" >> "$GITHUB_ENV"
+            echo "CIBW_ENVIRONMENT_MACOS=PKG_CONFIG_PATH=$PWD/.openblas" >> "$GITHUB_ENV"
           fi
 
       # Used to run cibuildwheel

cibuildwheel.toml

@@ -1,6 +1,7 @@
 [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`.
+# universal2 wheels are not supported (see gh-21233), use `delocate-fuse` if you need them
 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"
@@ -24,16 +25,6 @@ musllinux-aarch64-image = "musllinux_1_2"
 RUNNER_OS="Linux"
 # /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
-# Not clear why the DYLD_LIBRARY_PATH is not passed through from the environment
-repair-wheel-command = [
-  "export DYLD_LIBRARY_PATH=$PWD/.openblas/lib",
-  "echo DYLD_LIBRARY_PATH $DYLD_LIBRARY_PATH",
-  "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
-]
 
 [tool.cibuildwheel.windows]
 config-settings = {setup-args = ["--vsenv", "-Dallow-noblas=false"], build-dir="build"}

tools/wheels/cibw_before_build.sh

@@ -42,18 +42,6 @@ if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
     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 will
-    # pull these into the wheel. Use python to avoid windows/posix problems
-    python <<EOF
-import os, scipy_${OPENBLAS}, shutil
-srcdir = os.path.join(os.path.dirname(scipy_${OPENBLAS}.__file__), "lib")
-shutil.copytree(srcdir, os.path.join("$PKG_CONFIG_PATH", "lib"))
-srcdir = os.path.join(os.path.dirname(scipy_${OPENBLAS}.__file__), ".dylibs")
-if os.path.exists(srcdir):  # macosx delocate
-    shutil.copytree(srcdir, os.path.join("$PKG_CONFIG_PATH", ".dylibs"))
-EOF
-    # pkg-config scipy-openblas --print-provides
 fi
 
 # cibuildwheel doesn't install delvewheel by default (it does install