Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix packagecloud wget schema url
[releng/global-jjb.git]
/
shell
/
tox-install.sh
diff --git
a/shell/tox-install.sh
b/shell/tox-install.sh
index
25ff3ca
..
f8472cc
100644
(file)
--- a/
shell/tox-install.sh
+++ b/
shell/tox-install.sh
@@
-15,6
+15,13
@@
echo "---> tox-install.sh"
set -eux -o pipefail
# Tox version is pulled in through detox to mitigate version conflict
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
+
$PYTHON -m pip freeze
$PYTHON -m pip freeze