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: Remove stale opensdk version pinning
[releng/global-jjb.git]
/
shell
/
tox-install.sh
diff --git
a/shell/tox-install.sh
b/shell/tox-install.sh
index
cc815cc
..
56bc43a
100644
(file)
--- a/
shell/tox-install.sh
+++ b/
shell/tox-install.sh
@@
-14,13
+14,10
@@
echo "---> tox-install.sh"
# Use -x to show value of $PYTHON in output
set -eux -o pipefail
# Use -x to show value of $PYTHON in output
set -eux -o pipefail
-# Tox version is pulled in through detox to mitigate version conflict
+# shellcheck disable=SC1090
+source ~/lf-env.sh
-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
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
# installs are silent, show version details in log
$PYTHON --version
# installs are silent, show version details in log
$PYTHON --version