Split pip and setuptools install to 2 calls

We seem to be getting more success installing pip and setuptools this
way and hopefully fixes the post-build scripts to not require all
jobs that use python to need to update their virtualenv calls.

Change-Id: I0fba7ba0f574cb29561fcfdb1404272c67165582
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index f1918aa..298464d 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -20,6 +20,7 @@ python-openstackclient~=3.16.0
 EOF
 
 # Use `python -m pip` to ensure we are using the latest version of pip
-python -m pip install --user --quiet --upgrade pip==18.0 setuptools==40.0.0
+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