Merge "Add templates Tox + SonarQube Jenkins plugin"

[releng/global-jjb.git] / shell / python-tools-install.sh

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 7988c31..3a852d3 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -33,11 +33,14 @@ tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
 yq
 EOF
 
-    # Use `python -m pip` to ensure we are using pip from user venv
-    python3 -m venv ~/.local
-    python3 -m pip install --quiet --upgrade pip
-    python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools
-    python3 -m pip install --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
+    # Use `python -m pip` to upgrade to the latest pip into user site-packages
+    python3 -m pip install --user --quiet --upgrade pip
+    python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
+    python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
+    # installs are silent, show version details in log
+    python3 --version
+    python3 -m pip --version
+    python3 -m pip freeze
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
 fi