Chore: Upgrade Jenkins-job-builder to 6.3.0

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

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index d88c508..56bc43a 100644 (file)
--- 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 --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-else
-    $PYTHON -m pip install --quiet --upgrade tox tox-pyenv virtualenv
-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