Fix wheelbuilder passing specs to shell scripts

Author: timfel

scripts/wheelbuilder/build_wheels.py

@@ -51,6 +51,7 @@
 import importlib
 import os
 import re
+import shlex
 import shutil
 import subprocess
 import sys
@@ -107,6 +108,7 @@ def build_wheels(pip):
     packages_to_build = set()
     with open(join(dirname(__file__), "packages.txt")) as f:
         for line in f.readlines():
+            line = line.strip()
             name, version = line.split("==")
             if not packages_selected or name in packages_selected or line in packages_selected:
                 packages_to_build.add(line)
@@ -131,7 +133,11 @@ def build_wheels(pip):
             env["PATH"] = abspath(dirname(pip)) + os.pathsep + env["PATH"]
             env["VIRTUAL_ENV"] = abspath(dirname(dirname(pip)))
             print("Building", name, version, "with", script, flush=True)
-            subprocess.check_call([script, version], shell=True, env=env)
+            if sys.platform == "win32":
+                cmd = [script, version] # Python's subprocess.py does the quoting we need
+            else:
+                cmd = f"{shlex.quote(script)} {version}"
+            subprocess.check_call(cmd, shell=True, env=env)
             if not len(glob("*.whl")) > whl_count:
                 print("Building wheel for", name, version, "after", script, "did not", flush=True)
                 subprocess.check_call([pip, "wheel", spec])

scripts/wheelbuilder/darwin/scipy.sh

@@ -42,4 +42,8 @@ if [ -n "$GITHUB_RUN_ID" ]; then
     export PKG_CONFIG_PATH=/opt/homebrew/opt/openblas/lib/pkgconfig
 fi
 export FFLAGS=-fallow-argument-mismatch
-pip wheel "scipy==$1"
+if [ -n "$1" ]; then
+    pip wheel "scipy==$1"
+else
+    pip wheel scipy
+fi

scripts/wheelbuilder/darwin/torch.sh

@@ -44,4 +44,8 @@ if [ -n "$GITHUB_RUN_ID" ]; then
 fi
 export MAX_JOBS=4
 export BUILD_TEST=0
-pip wheel "torch==$1"
+if [ -n "$1" ]; then
+    pip wheel "torch==$1"
+else
+    pip wheel torch
+fi

scripts/wheelbuilder/linux/scipy.sh

@@ -41,4 +41,8 @@ if command -v manylinux-interpreters 2>&1 >/dev/null; then
     dnf install -y gcc-toolset-12-gcc-gfortran openblas-devel
 fi
 export FFLAGS=-fallow-argument-mismatch
-pip wheel "scipy==$1"
+if [ -n "$1" ]; then
+    pip wheel "scipy==$1"
+else
+    pip wheel scipy
+fi

scripts/wheelbuilder/linux/tensorflow.sh

@@ -47,5 +47,9 @@ curl -L https://github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-
 chmod +x tmp_bazel/bazel
 export PATH=$(pwd)/tmp_bazel/:$PATH
 bazel --version
-pip wheel "tensorflow==$1"
+if [ -n "$1" ]; then
+    pip wheel "tensorflow==$1"
+else
+    pip wheel tensorflow
+fi
 rm -rf tmp_bazel

scripts/wheelbuilder/linux/torch.sh

@@ -43,4 +43,8 @@ if command -v manylinux-interpreters 2>&1 >/dev/null; then
 fi
 export MAX_JOBS=4
 export BUILD_TEST=0
-pip wheel "torch==$1"
+if [ -n "$1" ]; then
+    pip wheel "torch==$1"
+else
+    pip wheel torch
+fi