Merge pull request tensorflow#19819 from av8ramit/fix_setuptools3

yifeif · web-flow · commit fe22be3cbf87 · 2018-06-06T13:42:49.000-07:00
Force downgrade setuptools for tests after tf whl is installed.
diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh
@@ -315,14 +315,17 @@ create_activate_virtualenv_and_install_tensorflow() {
   # Upgrade pip so it supports tags such as cp27mu, manylinux1 etc.
   echo "Upgrade pip in virtualenv"
   pip install --upgrade pip==9.0.1
-  pip install --upgrade setuptools==39.1.0
 
   # Force tensorflow reinstallation. Otherwise it may not get installed from
   # last build if it had the same version number as previous build.
   PIP_FLAGS="--upgrade --force-reinstall"
   pip install -v ${PIP_FLAGS} ${WHL_PATH} || \
     die "pip install (forcing to reinstall tensorflow) FAILED"
   echo "Successfully installed pip package ${TF_WHEEL_PATH}"
+
+  # Force downgrade setuptools.
+  pip install --upgrade setuptools==39.1.0
+
 }
 
 ################################################################################
