Merge remote-tracking branch 'upstream/master' into ci/docs/use-mkdocs

Author: smokestacklightnin

.bazelversion

@@ -1 +1 @@
-6.1.0
+6.5.0

README.md

@@ -4,7 +4,7 @@
 [![PyPI](https://badge.fury.io/py/struct2tensor.svg)](https://badge.fury.io/py/struct2tensor)
 
 <!--*
-freshness: { owner: 'iindyk' reviewed: '2024-04-22' }
+freshness: { owner: 'iindyk' reviewed: '2025-04-02' }
 *-->
 
 ## Introduction
@@ -116,6 +116,8 @@ is an integer.
 
 struct2tensor                                                          | tensorflow
 ---------------------------------------------------------------------- | ----------
+[0.48.0](https://github.com/google/struct2tensor/releases/tag/v0.48.0) | 2.17.0
+[0.47.0](https://github.com/google/struct2tensor/releases/tag/v0.47.0) | 2.16.2
 [0.46.0](https://github.com/google/struct2tensor/releases/tag/v0.46.0) | 2.15.0
 [0.45.0](https://github.com/google/struct2tensor/releases/tag/v0.45.0) | 2.13.0
 [0.44.0](https://github.com/google/struct2tensor/releases/tag/v0.44.0) | 2.12.0

RELEASE.md

@@ -1,6 +1,6 @@
 # `struct2tensor` release notes
 
-# Current Version (not yet released; still in development)
+## Current Version (not yet released; still in development)
 
 ## Major Features and Improvements
 
@@ -10,7 +10,47 @@
 
 ## Deprecations
 
-# Version 0.46.0
+## Version 0.48.0
+
+## Major Features and Improvements
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   Depends on `protobuf>=4.25.2,<6.0.0` for Python 3.11 and on `protobuf>=4.21.6,<6.0.0` for 3.9 and 3.10.
+*   Depends on `tensorflow 2.17.1`.
+*   macOS wheel publishing is temporarily paused due to missing ARM64 support.
+
+## Breaking Changes
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Version 0.47.0
+
+## Major Features and Improvements
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   Bumped the minimum bazel version required to build `struct2tensor` to 6.5.0.
+*   Depends on `tensorflow 2.16.2`.
+*   Relax dependency on Protobuf to include version 5.x
+
+## Breaking Changes
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Version 0.46.0
 
 ## Major Features and Improvements
 
@@ -33,7 +73,7 @@
 
 *   Deprecated python 3.8 support.
 
-# Version 0.45.0
+## Version 0.45.0
 
 ## Major Features and Improvements
 
@@ -53,7 +93,7 @@
 
 *   N/A
 
-# Version 0.44.0
+## Version 0.44.0
 
 ## Major Features and Improvements
 
@@ -73,7 +113,7 @@
 
 *   Deprecated python 3.7 support.
 
-# Version 0.43.0
+## Version 0.43.0
 
 ## Major Features and Improvements
 
@@ -91,7 +131,7 @@
 
 *   N/A
 
-# Version 0.42.0
+## Version 0.42.0
 
 ## Major Features and Improvements
 
@@ -110,7 +150,7 @@
 
 *   N/A
 
-# Version 0.41.0
+## Version 0.41.0
 
 ## Major Features and Improvements
 
@@ -129,7 +169,7 @@
 
 *   N/A
 
-# Version 0.40.0
+## Version 0.40.0
 
 ## Major Features and Improvements
 
@@ -150,7 +190,7 @@
 
 *   N/A
 
-# Version 0.39.0
+## Version 0.39.0
 
 ## Major Features and Improvements
 
@@ -168,7 +208,7 @@
 
 *   N/A
 
-# Version 0.38.0
+## Version 0.38.0
 
 ## Major Features and Improvements
 
@@ -188,7 +228,7 @@
 
 *   N/A
 
-# Version 0.37.0
+## Version 0.37.0
 
 ## Major Features and Improvements
 
@@ -206,7 +246,7 @@
 
 *   N/A
 
-# Version 0.36.0
+## Version 0.36.0
 
 ## Major Features and Improvements
 
@@ -225,7 +265,7 @@
 
 *   N/A
 
-# Version 0.35.0
+## Version 0.35.0
 
 ## Major Features and Improvements
 
@@ -243,7 +283,7 @@
 
 *   Deprecated python 3.6 support.
 
-# Version 0.34.0
+## Version 0.34.0
 
 ## Major Features and Improvements
 

WORKSPACE

@@ -88,4 +88,4 @@ rules_pkg_dependencies()
 
 # Specify the minimum required bazel version.
 load("@bazel_skylib//lib:versions.bzl", "versions")
-versions.check("6.1.0")
+versions.check("6.5.0")

setup.py

@@ -72,8 +72,10 @@ def select_constraint(default, nightly=None, git_master=None):
 setup(
     name='struct2tensor',
     version=__version__,
-    description=('Struct2Tensor is a package for parsing and manipulating'
-                 ' structured data for TensorFlow'),
+    description=(
+        'Struct2Tensor is a package for parsing and manipulating'
+        ' structured data for TensorFlow'
+    ),
     author='Google LLC',
     author_email='[email protected]',
     # Contained modules and scripts.
@@ -82,16 +84,15 @@ def select_constraint(default, nightly=None, git_master=None):
         # TODO(b/263060885): Remove the explicit numpy dependency once TF works
         # with numpy>=1.24.
         'numpy>=1.22',
-        'protobuf>=4.25.2,<5;python_version>="3.11"',
-        'protobuf>=3.20.3,<5;python_version<"3.11"',
-        'tensorflow' + select_constraint(
-            default='>=2.15,<2.16',
-            nightly='>=2.16.0.dev',
-            git_master='@git+https://github.com/tensorflow/tensorflow@master'),
-        'tensorflow-metadata' + select_constraint(
-            default='>=1.15.0,<1.16.0',
-            nightly='>=1.16.0.dev',
-            git_master='@git+https://github.com/tensorflow/metadata@master'),
+        'protobuf>=4.25.2,<6.0.0;python_version>="3.11"',
+        'protobuf>=4.21.6,<6.0.0;python_version<"3.11"',
+        'tensorflow>=2.17,<2.18',
+        'tensorflow-metadata'
+        + select_constraint(
+            default='>=1.17.0,<1.18.0',
+            nightly='>=1.18.0.dev',
+            git_master='@git+https://github.com/tensorflow/metadata@master',
+        ),
         'pyarrow>=10,<11',
     ],
     extras_require={"docs": docs_reqs},
@@ -125,4 +126,5 @@ def select_constraint(default, nightly=None, git_master=None):
     keywords='tensorflow protobuf machine learning',
     long_description=_LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
-    cmdclass={'install': _InstallPlatlib})
+    cmdclass={'install': _InstallPlatlib},
+)

struct2tensor/BUILD

@@ -37,7 +37,6 @@ s2t_pytype_library(
     srcs = [
         "__init__.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":expression",
@@ -55,7 +54,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/__init__.py",
     ],
-    srcs_version = "PY2AND3",
     deps = [
         ":calculate_options",
         ":expression",
@@ -84,7 +82,6 @@ s2t_pytype_library(
     srcs = [
         "path.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         "@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:py_metadata_v0_proto_py",
         "@com_google_protobuf//:protobuf_python",
@@ -100,7 +97,6 @@ s2t_pytype_library(
         "prensor_util.py",
         "prensor_value.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":path",
@@ -117,7 +113,6 @@ s2t_pytype_library(
     srcs = [
         "calculate_options.py",
     ],
-    srcs_version = "PY3ONLY",
 )
 
 # Note: do not separate these, as eventually we want to make sure that they
@@ -146,7 +141,6 @@ s2t_pytype_library(
         "expression_impl/size.py",
         "expression_impl/slice_expression.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":path",
@@ -163,7 +157,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/map_prensor_to_prensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":path",
@@ -176,7 +169,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/placeholder.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":map_prensor_to_prensor",
@@ -190,7 +182,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/parquet.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":map_prensor_to_prensor",
@@ -207,7 +198,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/proto_test_util.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         "//struct2tensor/test:test_py_pb2",
@@ -220,7 +210,6 @@ s2t_pytype_library(
     srcs = [
         "prensor_to_structured_tensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":path",
         ":prensor",
@@ -232,7 +221,6 @@ s2t_pytype_library(
     srcs = [
         "structured_tensor_to_prensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":path",
         ":prensor",

struct2tensor/benchmarks/BUILD

@@ -16,6 +16,7 @@
 # Placeholder: load py_binary
 # Placeholder: load py_library
 # Placeholder: load py_test
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
 load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
@@ -29,7 +30,6 @@ proto_library(
 
 py_proto_library(
     name = "benchmark_proto_py_pb2",
-    api_version = 2,
     deps = [":benchmark_proto"],
 )
 
@@ -75,15 +75,13 @@ py_test(
     # Follow the instructions in the file to properly run the benchmark.
     args = ["--test_mode"],
     main = "struct2tensor_benchmark.py",
-    python_version = "PY3",
     shard_count = 4,
     deps = [":struct2tensor_benchmark_lib"],
 )
 
 py_binary(
     name = "struct2tensor_benchmark",
     srcs = ["struct2tensor_benchmark.py"],
-    python_version = "PY3",
     deps = [
         ":struct2tensor_benchmark_lib",
     ],
@@ -96,15 +94,13 @@ py_test(
     # Follow the instructions in the file to properly run the benchmark.
     args = ["--test_mode"],
     main = "ops_benchmark.py",
-    python_version = "PY3",
     # shard_count = 4,
     deps = [":struct2tensor_benchmark_lib"],
 )
 
 py_binary(
     name = "ops_benchmark",
     srcs = ["ops_benchmark.py"],
-    python_version = "PY3",
     deps = [
         ":struct2tensor_benchmark_lib",
     ],
@@ -113,7 +109,6 @@ py_binary(
 py_library(
     name = "struct2tensor_benchmark_util",
     srcs = ["struct2tensor_benchmark_util.py"],
-    srcs_version = "PY3ONLY",
     deps = [
         "//file/colossus/public:cns",
         "//third_party/py/cpuinfo",