Merge pull request #43 from rtg0795/r1.13.0

Update RELEASE.md for 1.31.1 release

Author: rtg0795

RELEASE.md

@@ -1,21 +1,17 @@
-# Version 1.13.0
+# Version 1.13.1
 
 ## Major Features and Improvements
 
-*   Introduce `Schema.represent_variable_length_as_ragged` knob to automatically
-    generate `RaggedTensor`s for variable length features.
-*   Introduces a Schema option `HistogramSelection` to allow numeric drift/skew
-    calculations to use QUANTILES histograms, which are more robust to outliers.
+*   N/A
 
 ## Bug Fixes and Other Changes
 
-*   N/A
+*   Depends on `protobuf>=3.20.3,<5`.
 
 ## Breaking Changes
 
 *   N/A
 
 ## Deprecations
 
-*   Deprecated Python 3.7 support.
-
+*   N/A

WORKSPACE

@@ -4,23 +4,22 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz"],
+    sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
+    ],
 )
 
-# 310ba5ee72661c081129eb878c1bbcec936b20f0 is based on 3.8.0 with a fix for protobuf.bzl.
-PROTOBUF_URLS = [
-    "https://storage.googleapis.com/mirror.tensorflow.org/github.com/protocolbuffers/protobuf/archive/310ba5ee72661c081129eb878c1bbcec936b20f0.tar.gz",
-    "https://github.com/protocolbuffers/protobuf/archive/310ba5ee72661c081129eb878c1bbcec936b20f0.tar.gz",
-]
-PROTOBUF_SHA256 = "b9e92f9af8819bbbc514e2902aec860415b70209f31dfc8c4fa72515a5df9d59"
-PROTOBUF_STRIP_PREFIX = "protobuf-310ba5ee72661c081129eb878c1bbcec936b20f0"
+_PROTOBUF_VERSION = "3.21.9"
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = PROTOBUF_SHA256,
-    strip_prefix = PROTOBUF_STRIP_PREFIX,
-    urls = PROTOBUF_URLS,
+    sha256 = "f66073dee0bc159157b0bd7f502d7d1ee0bc76b3c1eac9836927511bdc4b3fc1",
+    strip_prefix = "protobuf-%s" % _PROTOBUF_VERSION,
+    urls = [
+        "https://github.com/protocolbuffers/protobuf/archive/v%s.zip" % _PROTOBUF_VERSION
+    ],
 )
 
 # Needed by com_google_protobuf.
@@ -50,4 +49,4 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 protobuf_deps()
 
 load("@bazel_skylib//lib:versions.bzl", "versions")
-versions.check("0.24.1")
+versions.check("5.3.0")

setup.py

@@ -127,7 +127,7 @@ def run(self):
     install_requires=[
         'absl-py>=0.9,<2.0.0',
         'googleapis-common-protos>=1.52.0,<2',
-        'protobuf>=3.13,<4',
+        'protobuf>=3.20.3,<5',
     ],
     python_requires='>=3.8,<4',
     packages=find_packages(),

tensorflow_metadata/proto/v0/BUILD

@@ -20,7 +20,6 @@ licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
 
-
 cc_proto_library(
     name = "cc_metadata_v0_proto_cc",
     srcs = [
@@ -55,8 +54,8 @@ py_proto_library(
         "derived_feature.proto",
     ],
     deps = [
-        # For well-known proto types like protobuf.Any.
-        "@com_google_protobuf//:protobuf_python",
+      # For well-known proto types like protobuf.Any.
+      "@com_google_protobuf//:well_known_types_py_pb2"
     ],
 )
 

tensorflow_metadata/proto/v0/derived_feature.proto

@@ -54,6 +54,7 @@ message DerivedFeatureConfig {
     ArgmaxTopK argmax_top_k = 2;
     ReduceOp reduce_op = 3;
     SliceSql slice_sql = 4;
+    ImageQualityDeriver image_quality = 5;
   }
 }
 
@@ -87,4 +88,8 @@ message SliceSql {
 
   // Indicates whether to drop struct name in the generated output.
   bool drop_struct_name = 3;
-}
+}
+
+message ImageQualityDeriver {
+  string model_name = 1;
+}

tensorflow_metadata/version.py

@@ -14,4 +14,4 @@
 """Contains the version string of TFMD."""
 
 # Note that setup.py uses this version.
-__version__ = '1.13.0'
+__version__ = '1.13.1'