From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 10 Sep 2020 04:09:02 +0000 (+0000)
Subject: Merge "Remove tox from python-tools-install."
X-Git-Tag: v0.57.3^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=53065905f076834d00bfa542c2feeb8553ac177e;hp=e29b25d20f31f96778cdc849e3ffb706bae02920;p=releng%2Fglobal-jjb.git

Merge "Remove tox from python-tools-install."
---

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index bf1cf8eb..bf9b12ee 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -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