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 9ad3329..56bc43a 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -14,26 +14,10 @@ echo "---> tox-install.sh"
 # Use -x to show value of $PYTHON in output
 set -eux -o pipefail
 
-#Python 3.5 and python2 tox in Ubuntu 16.04 workaround
-done="False"
-if [[ -f /etc/lsb-release ]]; then
-   # shellcheck disable=SC1091
-   source /etc/lsb-release
-   if [[ $DISTRIB_RELEASE == "16.04" ]]; then
-       echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
-       python2 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-       python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp==1.1.0
-       done="True"
-   fi
-fi
+# shellcheck disable=SC1090
+source ~/lf-env.sh
 
-if [[ $done != "True" ]]; then
-    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
-fi
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
 
 # installs are silent, show version details in log
 $PYTHON --version