diff options
| author |  Amit Patankar <amitpatankar@google.com> | 2018-06-06 15:07:00 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-06 15:07:00 -0700 |
| commit | e1436b2952c7600c8ac88114210381db0398be16 (patch) | |
| tree | 2c2783b8259e350fa675e70242a5056928b6d86a | |
| parent | fe22be3cbf87c4609ad2cd092add53732aa79e6c (diff) | |
| parent | da3f4f86267a42f1a7780222143d79b167a75eb1 (diff) | |
Merge pull request #19820 from av8ramit/fix_setuptools4
Adding a constraint for the setuptools version.
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/pip.sh | 4 | ||||
| -rw-r--r-- | tensorflow/tools/pip_package/setup.py | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh index 883bb93647..5fa75e1d61 100755 --- a/tensorflow/tools/ci_build/builds/pip.sh +++ b/tensorflow/tools/ci_build/builds/pip.sh @@ -322,10 +322,6 @@ create_activate_virtualenv_and_install_tensorflow() { 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 - } ################################################################################ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 78d955c637..97f625e7e9 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -54,6 +54,7 @@ REQUIRED_PACKAGES = [ 'numpy >= 1.13.3', 'six >= 1.10.0', 'protobuf >= 3.4.0', + 'setuptools <= 39.1.0', 'tensorboard >= 1.8.0, < 1.9.0', 'termcolor >= 1.1.0', ] |