From: Thanh Ha Date: Mon, 5 Nov 2018 07:23:44 +0000 (+0800) Subject: Pull in tox implicitly through detox X-Git-Tag: v0.27.0~13 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=59fddb14b61b70dcdc2abde099c8a8c8f313d891;p=releng%2Fglobal-jjb.git Pull in tox implicitly through detox detox's own requirements.txt limits the version of tox that it pulls in. This can often conflict with the explicit version we set. Let's use the version of tox as required by detox. Issue: https://jira.opendaylight.org/browse/RELENG-136 Change-Id: I0b98afc6c993279c17cdd02d67471fadde23e552 Signed-off-by: Thanh Ha --- diff --git a/releasenotes/notes/tox-conflict-926cc82f95fbc930.yaml b/releasenotes/notes/tox-conflict-926cc82f95fbc930.yaml new file mode 100644 index 00000000..c6646f2c --- /dev/null +++ b/releasenotes/notes/tox-conflict-926cc82f95fbc930.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + New detox version requires tox >= 3.5 and < 4. Instead of + explicitly pulling tox, we are now implicitly pulling via + detox. (https://jira.opendaylight.org/browse/RELENG-136) diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 3aceceb2..ad983362 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -14,7 +14,8 @@ echo "---> tox-install.sh" # DO NOT set -u as virtualenv's activate script has unbound variables set -e -o pipefail -python -m pip install --user --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