From f7bb22c08c7887762fdc573155c8dfe656a1500f Mon Sep 17 00:00:00 2001 From: Michael Case Date: Fri, 25 Jan 2019 16:11:16 -0800 Subject: [PATCH 1/3] Update Estimator version in setup,py This needs to be cherry-picked to TF r1.13 branch. There now exists a tensorflow_estimator==1.13.0rc0 release on pypi. PiperOrigin-RevId: 230987863 --- tensorflow/tools/pip_package/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 41be06f691bea4..74d1f71c734909 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -57,7 +57,7 @@ 'six >= 1.10.0', 'protobuf >= 3.6.1', 'tensorboard >= 1.12.0, < 1.13.0', - 'tensorflow_estimator >= 1.10.0', + 'tensorflow_estimator >= 1.13.0 < 1.14.0', 'termcolor >= 1.1.0', ] From d866bc9d0442cf0e7e86906394ed520d55744e45 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Mon, 28 Jan 2019 06:36:00 -0800 Subject: [PATCH 2/3] Fix estimator dependency. This needs to be cherry-picked to TF r1.13 branch. PiperOrigin-RevId: 231209093 --- tensorflow/tools/pip_package/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 74d1f71c734909..7b5f04ac779623 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -57,7 +57,7 @@ 'six >= 1.10.0', 'protobuf >= 3.6.1', 'tensorboard >= 1.12.0, < 1.13.0', - 'tensorflow_estimator >= 1.13.0 < 1.14.0', + 'tensorflow_estimator >= 1.13.0, < 1.14.0', 'termcolor >= 1.1.0', ] From 730a0f1ba2a0a236a3827801bfbd2b00272dc0d2 Mon Sep 17 00:00:00 2001 From: Michael Case Date: Mon, 28 Jan 2019 10:38:35 -0800 Subject: [PATCH 3/3] Change estimator dep to >1.13rc0. PiperOrigin-RevId: 231246464 --- tensorflow/tools/pip_package/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 7b5f04ac779623..d69aea277130f8 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -57,7 +57,7 @@ 'six >= 1.10.0', 'protobuf >= 3.6.1', 'tensorboard >= 1.12.0, < 1.13.0', - 'tensorflow_estimator >= 1.13.0, < 1.14.0', + 'tensorflow_estimator >= 1.13.0rc0, < 1.14.0rc0', 'termcolor >= 1.1.0', ]