Merge "Add templates Tox + SonarQube Jenkins plugin"

[releng/global-jjb.git] / shell / tox-install.sh

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 25ff3ca..cc815cc 100644 (file)
--- 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