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
Feat: Add support for OpenJDK17
[releng/global-jjb.git]
/
shell
/
python-tools-install.sh
diff --git
a/shell/python-tools-install.sh
b/shell/python-tools-install.sh
index
72baf8a
..
20a6360
100644
(file)
--- a/
shell/python-tools-install.sh
+++ b/
shell/python-tools-install.sh
@@
-23,7
+23,6
@@
if [[ ! -f /tmp/pre-build-complete ]]; then
echo "Generating Requirements File"
cat << 'EOF' > "$requirements_file"
echo "Generating Requirements File"
cat << 'EOF' > "$requirements_file"
-lftools[openstack]
python-heatclient
python-openstackclient
python-magnumclient
python-heatclient
python-openstackclient
python-magnumclient
@@
-39,6
+38,7
@@
yq
# necessary so that future maintainers of this file can make decisions to
# remove the workarounds in the future.
importlib-resources<2.0.0 # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
# necessary so that future maintainers of this file can make decisions to
# remove the workarounds in the future.
importlib-resources<2.0.0 # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
+pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2
EOF
#Python 3.5 in Ubuntu 16.04 workaround
EOF
#Python 3.5 in Ubuntu 16.04 workaround
@@
-53,7
+53,9
@@
EOF
python3 -m pip install --user --quiet --upgrade pip
python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
python3 -m pip install --user --quiet --upgrade pip
python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
- python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
+ python3 -m pip install --user --quiet --no-warn-script-location --upgrade lftools[openstack]
+ python3 -m pip install --user --quiet --no-warn-script-location --upgrade \
+ --upgrade-strategy eager -r "$requirements_file"
# installs are silent, show version details in log
python3 --version
python3 -m pip --version
# installs are silent, show version details in log
python3 --version
python3 -m pip --version