X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Fpython-tools-install.sh;h=bf1cf8eb9bacdb7df690c6ffe12ad0060c68355c;hb=e3b47c77a181b5f5bd3a79802a46188adb6173ce;hp=eae3c1f40d37ecf85a0e75d6290f616251a6b27c;hpb=978e98083fe0a02c54b7737eb877897b7017c7a9;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index eae3c1f4..bf1cf8eb 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
@@ -31,6 +31,14 @@ kubernetes
 niet~=1.4.2
 tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
 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)
 EOF
 
     #Python 3.5 in Ubuntu 16.04 workaround
@@ -48,8 +56,19 @@ EOF
     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
+
+    #workaround
+    #system tox is py2.7 needs updated pip and setuptools.
+    #this needs to be fixed in packer. tox is py3 on my machine
+    python -m pip install --user --quiet --upgrade pip
+    python -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
+    python --version
+    python -m pip --version
+    python -m pip freeze
+
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
 fi