X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=bf9b12eeace2a8668cf70186f29b96eac64bcf5e;hb=refs%2Fchanges%2F12%2F65512%2F1;hp=d5a8f058c21694a828803b54e1affae3bedef6bc;hpb=2399be2ca1402a7d1043089c3c57d623d9bfc064;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index d5a8f058..bf9b12ee 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
@@ -29,7 +29,6 @@ python-openstackclient
 python-magnumclient
 kubernetes
 niet~=1.4.2
-tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
 yq
 
 # PINNED INDIRECT DEPENDENCIES
@@ -50,25 +49,23 @@ EOF
          echo "zipp==1.1.0" >> "$requirements_file"
        fi
     fi
-    # Use `python -m pip` to upgrade to the latest pip into user site-packages
+
+    #Project may still want to use system py27
+    #pip and setuptools must be updated for py27 to work.
+    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
+
     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"
     # 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