X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=ad9833626608351ab1d4f9a9e33a932a0284b735;hb=2a10c83b2d506008cc6c01c134515fb6328e1f3a;hp=9e50ead4021223df8f08421b025f4513960dee9c;hpb=9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 9e50ead4..ad983362 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. @@ -14,11 +14,8 @@ echo "---> tox-install.sh" # DO NOT set -u as virtualenv's activate script has unbound variables set -e -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 argparse detox "tox<3.0.0" tox-pyenv +# Tox version is pulled in through detox to mitigate version conflict +python -m pip install --user --quiet --upgrade argparse detox tox-pyenv echo "----> pip freeze" pip freeze