X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=cc815ccda79819ec0d0216331914e396308bf580;hb=b55451a53da28d40c62de5cae462302a32fe4c31;hp=25ff3ca5df1428f41b3780c6700a82bfa7e40632;hpb=49914d6b5bc5f50ed1592ee72ad9d62fa68ed3f4;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 25ff3ca5..cc815ccd 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -15,6 +15,14 @@ echo "---> tox-install.sh" set -eux -o pipefail # Tox version is pulled in through detox to mitigate version conflict -$PYTHON -m pip install --user --quiet --upgrade tox-pyenv +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 + +# installs are silent, show version details in log +$PYTHON --version +$PYTHON -m pip --version $PYTHON -m pip freeze