X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=20a63600d68dc7df074de7e28ab9049aa676792f;hb=refs%2Ftags%2Fv0.68.1;hp=eae3c1f40d37ecf85a0e75d6290f616251a6b27c;hpb=254bbe5cc592a507ff9be80171786526ec9332e7;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index eae3c1f4..20a63600 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -15,7 +15,7 @@ set -eufo pipefail
 # This script will typically be called during pre-build & post-build.
 # Create the user venv during pre-build.
 if [[ ! -f /tmp/pre-build-complete ]]; then
-    requirements_file=$(mktemp /tmp/requirements-XXXX.txt)
+    requirements_file=$(mktemp /tmp/requirements-XXXXXX)
 
     # Note: To test lftools master branch change the lftools configuration below in
     #       the requirements file from "lftools[openstack]~=#.##.#" to
@@ -23,33 +23,44 @@ if [[ ! -f /tmp/pre-build-complete ]]; then
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-lftools[openstack]
 python-heatclient
 python-openstackclient
 python-magnumclient
 kubernetes
 niet~=1.4.2
-tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
+cryptography<3.4
 yq
+
+# PINNED INDIRECT DEPENDENCIES
+# ============================
+# The libraries listed below should be considered workarounds and thus need
+# to have a link to a JIRA and any relevant pkg versions and support packages
+# 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
     if [[ -f /etc/lsb-release ]]; then
-       # shellcheck disable=SC1091
-       source /etc/lsb-release
-       if [[ $DISTRIB_RELEASE == "16.04" ]]; then
-         echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
-         echo "zipp==1.1.0" >> "$requirements_file"
-       fi
+        # shellcheck disable=SC1091
+        source /etc/lsb-release
+        if [[ $DISTRIB_RELEASE == "16.04" && $DISTRIB_ID == "Ubuntu" ]]; then
+            echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
+            echo "zipp==1.1.0" >> "$requirements_file"
+        fi
     fi
-    # Use `python -m pip` to upgrade to the latest pip into user site-packages
+
     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
     python3 -m pip freeze
+
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
 fi