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

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index cc815ccd..56bc43a9 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -14,13 +14,10 @@ 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
+# shellcheck disable=SC1090
+source ~/lf-env.sh
 
-if [[ $PYTHON == "python2" ]]; then
-    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-else
-    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
-fi
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
 
 # installs are silent, show version details in log
 $PYTHON --version