X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=488b5c8edaa7cdfffa6273ad030621de08746bad;hb=refs%2Ftags%2Fv0.84.0;hp=cc815ccda79819ec0d0216331914e396308bf580;hpb=29208c52916e4ec980def8482aa66d9ed88a208c;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-install.sh b/shell/tox-install.sh index cc815ccd..488b5c8e 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 --python python3.8 --venv-file /tmp/.toxenv tox==3.27.1 tox-pyenv virtualenv # installs are silent, show version details in log $PYTHON --version