X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=02db0c27d0d845074f67a63b7a4fa30dc5849825;hb=a86c6e8d376c95aa00b179fce9d207e61c8f72d0;hp=78716b0594741103bcd9b0b4cc6ff252b2979b39;hpb=e3b47c77a181b5f5bd3a79802a46188adb6173ce;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 78716b05..02db0c27 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -14,23 +14,7 @@ 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 - -if [[ $done != "True" ]]; then - python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp more-itertools~=5.0.0 - python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv -fi +python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv # installs are silent, show version details in log $PYTHON --version