X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=83097f9842a1fb4d71bf46e46fb0c8e9565f0984;hb=32fc471adb587ff7ee252ebd1b1e6664119185ea;hp=96c0fa38055f08e6f56551e76a969262893ba18b;hpb=ad0ee7c792b24345f2b419b3418bd84eac0f6ac1;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 96c0fa38..83097f98 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -10,16 +10,18 @@
 ##############################################################################
 echo "---> tox-install.sh"
 
-# Ensure we fail the job if any steps fail.
-# DO NOT set -u as virtualenv's activate script has unbound variables
-set -e -o pipefail
+# Ensure we fail the job if any steps fail or variables are missing.
+# Use -x to show value of $PYTHON in output
+set -eux -o pipefail
 
-virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox"
-# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
-source "/tmp/v/tox/bin/activate"
-pip install --quiet --upgrade "pip==9.0.3" setuptools
-pip install --quiet --upgrade pipdeptree
-pip install --quiet --upgrade argparse detox "tox<3.0.0" tox-pyenv
+# Tox version is pulled in through detox to mitigate version conflict
 
-echo "----> Pip Dependency Tree"
-pipdeptree
+
+if [[ $PYTHON == "python2" ]]; then
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv more-itertools~=5.0.0
+else
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv
+fi
+
+
+$PYTHON -m pip freeze