X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=56bc43a946f74739affe4a46524afa8ea6ff0fdd;hb=d1e8579fac0f3a0aeba74f70b27a06ab3fdad54f;hp=f8472cc9287ad5b5f8d3c922dc4802569ba7c74a;hpb=d92cb3ee2e72846f2f2dd6e607bc8e76087f1965;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-install.sh b/shell/tox-install.sh index f8472cc9..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 tox-pyenv virtualenv more-itertools~=5.0.0 -else - $PYTHON -m pip install --user --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