Change order of installations.

Amit Patankar · Amit Patankar · commit 3edabec18a47 · 2018-06-05T15:36:28.000-07:00
diff --git a/tensorflow/tools/ci_build/install/install_pip_packages.sh b/tensorflow/tools/ci_build/install/install_pip_packages.sh
@@ -21,9 +21,6 @@ set -e
 easy_install -U pip==9.0.3
 easy_install3 -U pip==9.0.3
 
-pip2 install --upgrade setuptools==39.1.0
-pip3 install --upgrade setuptools==39.1.0
-
 # Install pip packages from whl files to avoid the time-consuming process of
 # building from source.
 
@@ -57,6 +54,10 @@ pip3 install --upgrade markdown==2.6.8
 pip2 install --upgrade protobuf==3.3.0
 pip3 install --upgrade protobuf==3.3.0
 
+# Install last working version of setuptools.
+pip2 install --upgrade setuptools==39.1.0
+pip3 install --upgrade setuptools==39.1.0
+
 # Remove obsolete version of six, which can sometimes confuse virtualenv.
 rm -rf /usr/lib/python3/dist-packages/six*
 
diff --git a/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh b/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh
@@ -39,7 +39,6 @@ if [[ -z $pip35_version ]]; then
 fi
 
 set -e
-pip3.5 install --upgrade setuptools==39.1.0
 pip3.5 install --upgrade pip
 
 pip3.5 install --upgrade virtualenv
@@ -51,6 +50,9 @@ pip3.5 install --upgrade six==1.10.0
 # Install protobuf.
 pip3.5 install --upgrade protobuf==3.3.0
 
+# Install last working version of setuptools.
+pip3.5 install --upgrade setuptools==39.1.0
+
 # Remove obsolete version of six, which can sometimes confuse virtualenv.
 rm -rf /usr/lib/python3/dist-packages/six*
 
diff --git a/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh b/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh
@@ -49,7 +49,6 @@ cd Python-3.6.1
 make altinstall
 ln -s /usr/local/bin/pip3.6 /usr/local/bin/pip3
 
-pip3 install --upgrade setuptools==39.1.0
 pip3 install --upgrade pip
 
 pip3 install --upgrade virtualenv
@@ -63,6 +62,9 @@ pip3 install --upgrade six==1.10.0
 # Install protobuf.
 pip3 install --upgrade protobuf==3.3.0
 
+# Install last working version of setuptools.
+pip3 install --upgrade setuptools==39.1.0
+
 # Remove obsolete version of six, which can sometimes confuse virtualenv.
 rm -rf /usr/lib/python3/dist-packages/six*
 
