Merge pull request #91 from dhruvesh09/r0.24.0

R0.24.0

README.md

@@ -92,6 +92,8 @@ combinations may also work.
 |tensorflow-model-analysis                                                            |apache-beam[gcp]|pyarrow   |tensorflow         |tensorflow-metadata |tfx-bsl   |
 |------------------------------------------------------------------------------------ |----------------|----------|-------------------|--------------------|----------|
 |[GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.23.0         | 0.17.0   | nightly (1.x/2.x) | 0.24.0             | 0.24.0   |
+|[0.24.2](https://github.com/tensorflow/model-analysis/blob/v0.24.2/RELEASE.md)       | 2.23.0         | 0.17.0   | 1.15 / 2.3        | 0.24.0             | 0.24.2   |
+|[0.24.1](https://github.com/tensorflow/model-analysis/blob/v0.24.1/RELEASE.md)       | 2.23.0         | 0.17.0   | 1.15 / 2.3        | 0.24.0             | 0.24.1   |
 |[0.24.0](https://github.com/tensorflow/model-analysis/blob/v0.24.0/RELEASE.md)       | 2.23.0         | 0.17.0   | 1.15 / 2.3        | 0.24.0             | 0.24.0   |
 |[0.23.0](https://github.com/tensorflow/model-analysis/blob/v0.23.0/RELEASE.md)       | 2.23.0         | 0.17.0   | 1.15 / 2.3        | 0.23.0             | 0.23.0   |
 |[0.22.2](https://github.com/tensorflow/model-analysis/blob/v0.22.2/RELEASE.md)       | 2.20.0         | 0.16.0   | 1.15 / 2.2        | 0.22.2             | 0.22.0   |

RELEASE.md

@@ -1,12 +1,16 @@
-# Version 0.24.1
+# Version 0.24.2
 
 ## Major Features and Improvements
 
 *   N/A
 
 ## Bug fixes and other changes
 
-*   Fix Jupyter lab issue with missing data-base-url.
+*   Added an extra requirement group `all`. As a result, barebone TFMA does not
+    require `tensorflowjs` , `prompt-toolkit` and `ipython` any more.
+*   Added an extra requirement group `all` that specifies all the extra
+    dependencies TFMA needs. Use `pip install tensorflow-model-analysis[all]` to
+    pull in those dependencies.
 
 ## Breaking changes
 

g3doc/install.md

@@ -61,6 +61,8 @@ combinations may also work.
 tensorflow-model-analysis                                                            | apache-beam[gcp] | pyarrow | tensorflow        | tensorflow-metadata | tfx-bsl
 ------------------------------------------------------------------------------------ | ---------------- | ------- | ----------------- | ------------------- | -------
 [GitHub master](https://github.com/tensorflow/model-analysis/blob/master/RELEASE.md) | 2.23.0           | 0.17.0  | nightly (1.x/2.x) | 0.24.0              | 0.24.0
+[0.24.2](https://github.com/tensorflow/model-analysis/blob/v0.24.2/RELEASE.md)       | 2.23.0           | 0.17.0  | 1.15 / 2.3        | 0.24.0              | 0.24.2
+[0.24.1](https://github.com/tensorflow/model-analysis/blob/v0.24.1/RELEASE.md)       | 2.23.0           | 0.17.0  | 1.15 / 2.3        | 0.24.0              | 0.24.1
 [0.24.0](https://github.com/tensorflow/model-analysis/blob/v0.24.0/RELEASE.md)       | 2.23.0           | 0.17.0  | 1.15 / 2.3        | 0.24.0              | 0.24.0
 [0.23.0](https://github.com/tensorflow/model-analysis/blob/v0.23.0/RELEASE.md)       | 2.23.0           | 0.17.0  | 1.15 / 2.3        | 0.23.0              | 0.23.0
 [0.22.2](https://github.com/tensorflow/model-analysis/blob/v0.22.2/RELEASE.md)       | 2.20.0           | 0.16.0  | 1.15 / 2.2        | 0.22.2              | 0.22.0

setup.py

@@ -17,20 +17,25 @@
 The widget is based on the template generated from jupyter-widget's
 widget-cookiecutter.
 """
-from __future__ import print_function
-from distutils import log
-from distutils import spawn
 import os
 import platform
 import subprocess
 import sys
+
 from setuptools import Command
 from setuptools import find_packages
 from setuptools import setup
 from setuptools.command.build_py import build_py as _build_py
 from setuptools.command.develop import develop as _develop
 from setuptools.command.egg_info import egg_info
 from setuptools.command.sdist import sdist
+# pylint: disable=g-bad-import-order
+# It is recommended to import setuptools prior to importing distutils to avoid
+# using legacy behavior from distutils.
+# https://setuptools.readthedocs.io/en/latest/history.html#v48-0-0
+from distutils import log
+from distutils import spawn
+# pylint: enable=g-bad-import-order
 
 # Find the Protocol Compiler.
 if 'PROTOC' in os.environ and os.path.exists(os.environ['PROTOC']):
@@ -244,6 +249,32 @@ def run(self):
     update_package_data(self.distribution)
 
 
+def _make_extra_packages_tfjs():
+  # Packages needed for tfjs.
+  return [
+      'tensorflowjs>=2.0.1.post1,<3',
+      # TODO(b/158034704): Remove prompt-toolkit pin resulted from
+      # tfjs -> PyInquirer dependency chain.
+      'prompt-toolkit>=2.0.10,<3',
+      # TODO(b/167111340): Remove this dependency after the prompt-toolkit
+      # dependency issue is resolved.
+      'ipython>=7,<8',
+  ]
+
+
+def select_constraint(default, nightly=None, git_master=None):
+  """Select dependency constraint based on TFX_DEPENDENCY_SELECTOR env var."""
+  selector = os.environ.get('TFX_DEPENDENCY_SELECTOR')
+  if selector == 'UNCONSTRAINED':
+    return ''
+  elif selector == 'NIGHTLY' and nightly is not None:
+    return nightly
+  elif selector == 'GIT_MASTER' and git_master is not None:
+    return git_master
+  else:
+    return default
+
+
 # Get the long description from the README file.
 with open('README.md') as fp:
   _LONG_DESCRIPTION = fp.read()
@@ -267,9 +298,6 @@ def run(self):
         # Sort alphabetically
         'absl-py>=0.9,<0.11',
         'apache-beam[gcp]>=2.23,<3',
-        # TODO(b/167111340): Remove this dependency after the prompt-toolkit
-        # dependency issue is resolved.
-        'ipython>=7,<8',
         'ipywidgets>=7,<8',
         'jupyter>=1,<2',
         'numpy>=1.16,<2',
@@ -279,14 +307,19 @@ def run(self):
         'scipy>=1.4.1,<2',
         'six>=1.12,<2',
         'tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,<3',
-        'tensorflow-metadata>=0.24,<0.25',
-        'tfx-bsl>=0.24,<0.25',
-        'tensorflowjs>=2.0.1.post1,<3',
-        # TODO(b/158034704): Remove prompt-toolkit pin resulted from
-        # tfjs -> PyInquirer dependency chain.
-        'prompt-toolkit>=2.0.10,<3',
+        'tensorflow-metadata' + select_constraint(
+            default='>=0.24,<0.25',
+            nightly='>=0.25.0.dev',
+            git_master='@git+https://github.com/tensorflow/metadata@master'),
+        'tfx-bsl' + select_constraint(
+            default='>=0.24,<0.25',
+            nightly='>=0.25.0.dev',
+            git_master='@git+https://github.com/tensorflow/tfx-bsl@master'),
     ],
-    'python_requires': '>=3.5,<4',
+    'extras_require': {
+        'all': _make_extra_packages_tfjs(),
+    },
+    'python_requires': '>=3.6,<4',
     'packages': find_packages(),
     'zip_safe': False,
     'cmdclass': {

tensorflow_model_analysis/notebook/jupyter/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tensorflow_model_analysis",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "homepage": "https://github.com/tensorflow/model-analysis",
   "bugs": "https://github.com/tensorflow/model-analysis/issues",
   "license": "Apache-2.0",

tensorflow_model_analysis/version.py

@@ -16,4 +16,4 @@
 
 # Version string for this release of TFMA.
 # Note that setup.py reads and uses this version.
-VERSION = '0.24.1'
+VERSION = '0.24.2'