Install ONE requirements file with all requirements.

ci/win_install_deps.cmd

@@ -28,7 +28,8 @@ C:\Python39\python.exe -m pip install  numpy==1.19.3 "cython < 3" || goto :error
 C:\Python310\python.exe -m pip install numpy==1.21.3 "cython < 3" || goto :error
 C:\Python311\python.exe -m pip install numpy==1.23.5 "cython < 3" || goto :error
 C:\Python312\python.exe -m pip install numpy==1.26.3 "cython < 3" || goto :error
-C:\Python312\python.exe -m pip install setuptools || goto :error
+:: setuptools 70.2 leads to an error
+C:\Python312\python.exe -m pip install setuptools==70.1.1 || goto :error
 
 :: install nsis
 nsis-3.05-setup.exe /S || goto :error

packaging/python/build_requirements.txt

@@ -1,2 +1,8 @@
 cython<3
 packaging
+numpy==1.17.5;python_version=='3.8'
+numpy==1.19.3;python_version=='3.9' and platform_machine=='x86_64'
+numpy==1.21.3;python_version=='3.9' and platform_machine=='arm64'
+numpy==1.21.3;python_version=='3.10'
+numpy==1.23.5;python_version=='3.11'
+numpy==1.26.0;python_version=='3.12'

packaging/python/build_wheels.bash

@@ -25,10 +25,11 @@ fi
 
 py_ver=""
 
-clone_install_nmodl_requirements() {
+clone_nmodl_and_add_requirements() {
     git config --global --add safe.directory /root/nrn
     git submodule update --init --recursive --force --depth 1 -- external/nmodl
-    pip install -r external/nmodl/requirements.txt
+    # We only want the _build_ dependencies
+    sed -e '/^# runtime dependencies/,$ d' external/nmodl/requirements.txt >> my_requirements.txt
 }
 
 
@@ -52,29 +53,6 @@ setup_venv() {
 }
 
 
-pip_numpy_install() {
-    # numpy is special as we want the minimum wheel version
-    numpy_ver="numpy"
-    case "$py_ver" in
-      36) numpy_ver="numpy==1.12.1" ;;
-      37) numpy_ver="numpy==1.14.6" ;;
-      38) numpy_ver="numpy==1.17.5" ;;
-      39) numpy_ver="numpy==1.19.3" ;;
-      310) numpy_ver="numpy==1.21.3" ;;
-      311) numpy_ver="numpy==1.23.5" ;;
-      312) numpy_ver="numpy==1.26.0" ;;
-      *) echo "Error: numpy version not specified for this python!" && exit 1;;
-    esac
-
-    # older version for apple m1 as building from source fails
-    if [[ `uname -m` == 'arm64' && "$py_ver" == "39" ]]; then
-      numpy_ver="numpy==1.21.3"
-    fi
-
-    echo " - pip install $numpy_ver"
-    pip install $numpy_ver
-}
-
 build_wheel_linux() {
     echo "[BUILD WHEEL] Building with interpreter $1"
     local skip=
@@ -83,11 +61,7 @@ build_wheel_linux() {
 
     echo " - Installing build requirements"
     pip install auditwheel
-    pip install -r packaging/python/build_requirements.txt
-    pip_numpy_install
-
-    echo " - Building..."
-    rm -rf dist build
+    cp packaging/python/build_requirements.txt my_requirements.txt
 
     CMAKE_DEFS="NRN_MPI_DYNAMIC=$3"
     if [ "$USE_STATIC_READLINE" == "1" ]; then
@@ -96,10 +70,17 @@ build_wheel_linux() {
 
     if [ "$2" == "coreneuron" ]; then
         setup_args="--enable-coreneuron"
-        clone_install_nmodl_requirements
+        clone_nmodl_and_add_requirements
         CMAKE_DEFS="${CMAKE_DEFS},LINK_AGAINST_PYTHON=OFF"
     fi
 
+    cat my_requirements.txt
+    pip install -r my_requirements.txt
+    pip check
+
+    echo " - Building..."
+    rm -rf dist build
+
     # Workaround for https://github.com/pypa/manylinux/issues/1309
     git config --global --add safe.directory "*"
 
@@ -135,15 +116,11 @@ build_wheel_osx() {
     (( $skip )) && return 0
 
     echo " - Installing build requirements"
-    pip install -U delocate -r packaging/python/build_requirements.txt
-    pip_numpy_install
-
-    echo " - Building..."
-    rm -rf dist build
+    cp packaging/python/build_requirements.txt my_requirements.txt
 
     if [ "$2" == "coreneuron" ]; then
         setup_args="--enable-coreneuron"
-        clone_install_nmodl_requirements
+        clone_nmodl_and_add_requirements
         CMAKE_DEFS="${CMAKE_DEFS},LINK_AGAINST_PYTHON=OFF"
     fi
 
@@ -152,6 +129,13 @@ build_wheel_osx() {
       CMAKE_DEFS="$CMAKE_DEFS,NRN_BINARY_DIST_BUILD=ON,NRN_WHEEL_STATIC_READLINE=ON"
     fi
 
+    cat my_requirements.txt
+    pip install -U delocate -r my_requirements.txt
+    pip check
+
+    echo " - Building..."
+    rm -rf dist build
+
     # We need to "fix" the platform tag if the Python installer is universal2
     # See:
     #     * https://github.com/pypa/setuptools/issues/2520