X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=56bc43a946f74739affe4a46524afa8ea6ff0fdd;hb=d1e8579fac0f3a0aeba74f70b27a06ab3fdad54f;hp=3734a7f45c1728a725b3da6abf1026e8716eed90;hpb=511040b5508089fae1959c4f7da5dbd7621886c4;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 3734a7f4..56bc43a9 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -14,14 +14,12 @@ echo "---> tox-install.sh"
 # Use -x to show value of $PYTHON in output
 set -eux -o pipefail
 
-# Tox version is pulled in through detox to mitigate version conflict
-
-
-if [[ $PYTHON == "python2" ]]; then
-    $PYTHON -m pip install --user --quiet --upgrade tox-pyenv more-itertools~=5.0.0
-else
-    $PYTHON -m pip install --user --quiet --upgrade tox-pyenv
-fi
+# shellcheck disable=SC1090
+source ~/lf-env.sh
 
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
 
+# installs are silent, show version details in log
+$PYTHON --version
+$PYTHON -m pip --version
 $PYTHON -m pip freeze