Merge pull request #31430 from tensorflow/ggadde-cp2

cherrypick to fix the Linux CPU py2 pip builds
This commit is contained in:
Goldie Gadde 2019-08-07 20:24:37 -07:00 committed by GitHub
commit 0271554289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -452,6 +452,12 @@ install_tensorflow_pip() {
# ImportError: cannot import name py31compat
${PIP_BIN_PATH} install --upgrade setuptools==39.1.0 || \
die "Error: setuptools install, upgrade FAILED"
# Install the future package in the virtualenv. Installing it in user system
# packages does not appear to port it over when creating a virtualenv.
# ImportError: No module named builtins
${PIP_BIN_PATH} install --upgrade "future>=0.17.1" || \
die "Error: future install, upgrade FAILED"
}
run_test_with_bazel() {