Merge "Add lf-infra-wss-mvn-clean-install step"

[releng/global-jjb.git] / shell / python-tools-install.sh

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index c57609c..e0089c5 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -13,12 +13,24 @@ set -eux -o pipefail
 
 REQUIREMENTS_FILE=$(mktemp /tmp/requirements-XXXX.txt)
 
+# Note: To test lftools master branch change the lftools configuration below in
+#       the requirements file from "lftools[openstack]~=#.##.#" to
+#       git+https://github.com/lfit/releng-lftools.git#egg=lftools[openstack]
+
 cat << EOF > "$REQUIREMENTS_FILE"
-lftools~=0.15.0
+lftools[openstack]~=0.22.2
 python-heatclient~=1.16.1
 python-openstackclient~=3.16.0
+dogpile.cache~=0.6.8  # Version 0.7.[01] seems to break openstackclient
+niet~=1.4.2 # Extract values from yaml
 EOF
 
-python -m pip install --user --quiet --upgrade pip~=18.0 setuptools~=40.2.0
+echo "Requirements file"
+echo "-----------------"
+cat "$REQUIREMENTS_FILE"
+
+# Use `python -m pip` to ensure we are using the latest version of pip
+python -m pip install --user --quiet --upgrade pip
+python -m pip install --user --quiet --upgrade setuptools
 python -m pip install --user --quiet --upgrade -r "$REQUIREMENTS_FILE"
 pip freeze