Trim down dependencies, make new paths work

Author: rgommers

cibuildwheel.toml

@@ -5,7 +5,7 @@
 build-frontend = "build"
 skip = ["*_i686", "*_ppc64le", "*_s390x", "*_universal2"]
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
-before-test = "pip install -r {project}/requirements/test_requirements.txt"
+before-test = "pip install -r {project}/requirements/wheel_test_requirements.txt"
 test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 enable = ["cpython-freethreading", "pypy", "cpython-prerelease"]
 

requirements/openblas_requirements.txt

@@ -0,0 +1,3 @@
+scipy-openblas32==0.3.29.265.0 ; sys_platform == 'win32' and platform_machine == 'ARM64'
+# Note there is not yet a win-arm64 wheel, so we currently only exclude win-arm64
+scipy-openblas64==0.3.29.0.0 ; sys_platform != 'win32' or platform_machine != 'ARM64'

requirements/wheel_test_requirements.txt

@@ -0,0 +1,9 @@
+Cython
+setuptools==65.5.1 ; python_version < '3.12'
+setuptools         ; python_version >= '3.12'
+hypothesis==6.104.1
+pytest==7.4.0
+meson
+ninja; sys_platform != "emscripten"
+pytest-xdist
+threadpoolctl

tools/wheels/cibw_before_build.sh

@@ -1,22 +1,23 @@
 set -xe
 
 PROJECT_DIR="${1:-$PWD}"
+NUMPY_SRC_DIR="${1:-$PWD}/numpy-src"
 
 
 # remove any cruft from a previous run
 rm -rf build
 
 # Update license
-echo "" >> $PROJECT_DIR/LICENSE.txt
-echo "----" >> $PROJECT_DIR/LICENSE.txt
-echo "" >> $PROJECT_DIR/LICENSE.txt
-cat $PROJECT_DIR/LICENSES_bundled.txt >> $PROJECT_DIR/LICENSE.txt
+echo "" >> $NUMPY_SRC_DIR/LICENSE.txt
+echo "----" >> $NUMPY_SRC_DIR/LICENSE.txt
+echo "" >> $NUMPY_SRC_DIR/LICENSE.txt
+cat $NUMPY_SRC_DIR/LICENSES_bundled.txt >> $NUMPY_SRC_DIR/LICENSE.txt
 if [[ $RUNNER_OS == "Linux" ]] ; then
-    cat $PROJECT_DIR/tools/wheels/LICENSE_linux.txt >> $PROJECT_DIR/LICENSE.txt
+    cat $PROJECT_DIR/tools/wheels/LICENSE_linux.txt >> $NUMPY_SRC_DIR/LICENSE.txt
 elif [[ $RUNNER_OS == "macOS" ]]; then
-    cat $PROJECT_DIR/tools/wheels/LICENSE_osx.txt >> $PROJECT_DIR/LICENSE.txt
+    cat $PROJECT_DIR/tools/wheels/LICENSE_osx.txt >> $NUMPY_SRC_DIR/LICENSE.txt
 elif [[ $RUNNER_OS == "Windows" ]]; then
-    cat $PROJECT_DIR/tools/wheels/LICENSE_win32.txt >> $PROJECT_DIR/LICENSE.txt
+    cat $PROJECT_DIR/tools/wheels/LICENSE_win32.txt >> $NUMPY_SRC_DIR/LICENSE.txt
 fi
 
 if [[ $(python -c"import sys; print(sys.maxsize)") < $(python -c"import sys; print(2**33)") ]]; then
@@ -46,7 +47,7 @@ if [[ "$INSTALL_OPENBLAS" = "true" ]] ; then
     PKG_CONFIG_PATH=$PROJECT_DIR/.openblas
     rm -rf $PKG_CONFIG_PATH
     mkdir -p $PKG_CONFIG_PATH
-    python -m pip install -r requirements/ci_requirements.txt
+    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

tools/wheels/cibw_test_command.sh

@@ -4,7 +4,6 @@ set -xe
 
 PROJECT_DIR="$1"
 
-python -m pip install threadpoolctl
 python -c "import numpy; numpy.show_config()"
 
 if [[ $RUNNER_OS == "Windows" ]]; then
@@ -40,9 +39,7 @@ if [[ $FREE_THREADED_BUILD == "True" ]]; then
 fi
 
 # Run full tests with -n=auto. This makes pytest-xdist distribute tests across
-# the available N CPU cores: 2 by default for Linux instances and 4 for macOS arm64
-# Also set a 30 minute timeout in case of test hangs and on success, print the
-# durations for the 10 slowests 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', '--timeout=1800', '--durations=10']))"
+# 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']))"
 python $PROJECT_DIR/tools/wheels/check_license.py