From 3edabec18a47e41f2cfc71d4e3a4280b77881f83 Mon Sep 17 00:00:00 2001 From: Amit Patankar Date: Tue, 5 Jun 2018 10:28:38 -0700 Subject: [PATCH] Change order of installations. --- tensorflow/tools/ci_build/install/install_pip_packages.sh | 7 ++++--- .../tools/ci_build/install/install_python3.5_pip_packages.sh | 4 +++- .../tools/ci_build/install/install_python3.6_pip_packages.sh | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tensorflow/tools/ci_build/install/install_pip_packages.sh b/tensorflow/tools/ci_build/install/install_pip_packages.sh index bd6c50b..dba2dfc 100755 --- 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 index 0844c48..e1978cd 100755 --- 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 index fb183b0..0ffb8e6 100755 --- 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* -- 2.7.4