Prepare TFMA for 0.15.0 release

PiperOrigin-RevId: 274836116
tensorflow · Oct 15, 2019 · 35ab9fc · 35ab9fc
1 parent dd47712
commit 35ab9fc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -61,7 +61,8 @@ combinations may also work.
 
 |tensorflow-model-analysis                                                           |tensorflow    |apache-beam[gcp]|
 |------------------------------------------------------------------------------------|--------------|----------------|
-|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md)|nightly (1.x) |2.14.0          |
+|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md)|nightly (1.x) |2.16.0          |
+|[0.14.0](https://github.com/tensorflow/model-analysis/blob/v0.14.0/RELEASE.md)      |1.15          |2.16.0          |
 |[0.14.0](https://github.com/tensorflow/model-analysis/blob/v0.14.0/RELEASE.md)      |1.14          |2.14.0          |
 |[0.13.1](https://github.com/tensorflow/model-analysis/blob/v0.13.1/RELEASE.md)      |1.13          |2.11.0          |
 |[0.13.0](https://github.com/tensorflow/model-analysis/blob/v0.13.0/RELEASE.md)      |1.13          |2.11.0          |

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,4 @@
-# Current version (not yet released; still in development)
+# Current version 0.15.0
 
 ## Major Features and Improvements
 
@@ -25,6 +25,8 @@
     with latest master, `tfx-bsl` must also be latest master.
 *   Depends on `tfx-bsl>=0.15.0.dev0,<0.16`.
 *   Slicing now supports conversion between int/floats and strings.
+*   Depends on `apache-beam[gcp]>=2.16,<3`..
+*   Depends on `six==1.12`.
 
 ## Breaking changes
 
@@ -33,6 +35,7 @@
 *   Update config serialization to use JSON instead of pickling and reformat
     config to include input_data_specs, model_specs, output_data_specs, and
     metrics_specs.
+*   Requires pre-installed TensorFlow >=1.15,<2.
 
 ## Deprecations
 

diff --git a/g3doc/install.md b/g3doc/install.md
@@ -57,7 +57,8 @@ combinations may also work.
 
 |tensorflow-model-analysis                                                           |tensorflow    |apache-beam[gcp]|
 |------------------------------------------------------------------------------------|--------------|----------------|
-|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md)|nightly (1.x) |2.14.0          |
+|[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md)|nightly (1.x) |2.16.0          |
+|[0.15.0](https://github.com/tensorflow/model-analysis/blob/v0.15.0/RELEASE.md)      |1.15          |2.16.0          |
 |[0.14.0](https://github.com/tensorflow/model-analysis/blob/v0.14.0/RELEASE.md)      |1.14          |2.14.0          |
 |[0.13.1](https://github.com/tensorflow/model-analysis/blob/v0.13.1/RELEASE.md)      |1.13          |2.11.0          |
 |[0.13.0](https://github.com/tensorflow/model-analysis/blob/v0.13.0/RELEASE.md)      |1.13          |2.11.0          |

diff --git a/setup.py b/setup.py
@@ -256,7 +256,7 @@ def run(self):
     # protobuf) with TF.
     'install_requires': [
         # Sort alphabetically
-        'apache-beam[gcp]>=2.14,<3',
+        'apache-beam[gcp]>=2.16,<3',
         'ipywidgets>=7,<8',
         'jupyter>=1,<2',
         'numpy>=1.16,<2',
@@ -267,11 +267,11 @@ def run(self):
         # Note: try version 1.10 if error "metaclass conflict: the
         # metaclass of a derived class must be a (non-strict) subclass of the
         # metaclasses of all its bases" occurred in future.
-        'six>=1.10,<2',
+        'six>=1.12,<2',
         # TODO(xinzha): Uncomment this once TF can automatically select between
         # CPU and GPU installation.
         # 'tensorflow>=1.14,<2',
-        'tfx-bsl>=0.15.0.dev0,<0.16'
+        'tfx-bsl>=0.15,<0.16'
     ],
     'python_requires': '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<4',
     'packages': find_packages(),

diff --git a/tensorflow_model_analysis/api/model_eval_lib.py b/tensorflow_model_analysis/api/model_eval_lib.py
@@ -56,9 +56,9 @@ def _assert_tensorflow_version():
   """Check that we're using a compatible TF version."""
   # Fail with a clear error in case we are not using a compatible TF version.
   major, minor, _ = tf.version.VERSION.split('.')
-  if (int(major) not in (1, 2)) or (int(major == 1 and int(minor) < 14)):
+  if (int(major) not in (1, 2)) or (int(major == 1 and int(minor) < 15)):
     raise RuntimeError(
-        'Tensorflow version >= 1.14, < 3 is required. Found (%s). Please '
+        'Tensorflow version >= 1.15, < 3 is required. Found (%s). Please '
         'install the latest 1.x or 2.x version from '
         'https://github.com/tensorflow/tensorflow. ' % tf.version.VERSION)
 

diff --git a/tensorflow_model_analysis/version.py b/tensorflow_model_analysis/version.py
@@ -15,4 +15,4 @@
 
 # Version string for this release of TFMA.
 # Note that setup.py reads and uses this version.
-VERSION_STRING = '0.15.0dev'
+VERSION_STRING = '0.15.0'