21601: Install wheel in run-tests.sh VENV3DIR
authorBrett Smith <brett.smith@curii.com>
Tue, 19 Mar 2024 03:04:59 +0000 (23:04 -0400)
committerBrett Smith <brett.smith@curii.com>
Sat, 23 Mar 2024 20:31:15 +0000 (16:31 -0400)
We do this basically everywhere else in our build infrastructure, so
doing it here helps avoid discrepancies between those environments.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

build/run-tests.sh

index 1f28915a29269f19936ddd8a40085cc82b8c8be3..c425a48a94eb95993f77deedbfd3324331f62d55 100755 (executable)
@@ -636,13 +636,15 @@ install_env() {
     setup_virtualenv "$VENV3DIR"
     . "$VENV3DIR/bin/activate"
 
+    # wheel modernizes the venv (as of early 2024) and makes it more closely
+    # match our package build environment.
     # PyYAML is a test requirement used by run_test_server.py and needed for
     # other, non-Python tests.
     # pdoc is needed to build PySDK documentation.
     # We run `setup.py build` first to generate _version.py.
-    env -C "$WORKSPACE/sdk/python" python3 setup.py build \
-        && python3 -m pip install "$WORKSPACE/sdk/python" \
-        && python3 -m pip install PyYAML pdoc \
+    pip install PyYAML pdoc wheel \
+        && env -C "$WORKSPACE/sdk/python" python3 setup.py build \
+        && pip install "$WORKSPACE/sdk/python" \
         || fatal "installing Python SDK and related dependencies failed"
 }