Bumped minimum bazel version to 6.1.0.

PiperOrigin-RevId: 607717583
google · Feb 16, 2024 · 403e15c · 403e15c
1 parent 573c60d
commit 403e15c
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 26 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -15,6 +15,7 @@
 *   Deprecate GetLineageGraph API.
 *   Deprecate OSS support on Windows OS platform.
 *   Deprecated python 3.8 support.
+*   Bumped minimum bazel version to 6.1.0.
 
 ## Bug Fixed and Other Changes
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -69,11 +69,9 @@ http_archive(
 
 http_archive(
     name = "com_google_googletest",
-    sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86",
-    strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb",
-    urls = [
-        "https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip",
-    ],
+    sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
+    strip_prefix = "googletest-release-1.12.1",
+    urls = ["https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz"],
 )
 
 http_archive(
@@ -86,12 +84,13 @@ http_archive(
     sha256 = "6281aa4eeecb9e932d7091f99872e7b26fa6aacece49c15ce5b14af2b7ec050f",
 )
 
+# 1.5.0
 http_archive(
     name = "bazel_skylib",
-    sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
+    sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
     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",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
     ],
 )
 
@@ -109,9 +108,9 @@ http_archive(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53",
-    strip_prefix = "protobuf-3.21.12",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.12.tar.gz"],
+    sha256 = "1add10f9bd92775b91f326da259f243881e904dd509367d5031d4c782ba82810",
+    strip_prefix = "protobuf-3.21.9",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.9.tar.gz"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -283,4 +282,4 @@ ml_metadata_workspace()
 
 # Specify the minimum required bazel version.
 load("@bazel_skylib//lib:versions.bzl", "versions")
-versions.check("5.3.0")
+versions.check("6.1.0")
diff --git a/ml_metadata/.bazelversion b/ml_metadata/.bazelversion
@@ -11,4 +11,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-5.3.0
+6.1.0
diff --git a/ml_metadata/metadata_store/metadata_store_test.cc b/ml_metadata/metadata_store/metadata_store_test.cc
@@ -1460,6 +1460,6 @@ INSTANTIATE_TEST_SUITE_P(
     MetadataStoreTest, MetadataStoreTestSuite, ::testing::Values([]() {
       return std::make_unique<RDBMSMetadataStoreContainer>();
     }));
-
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MetadataStoreTestSuite);
 }  // namespace testing
 }  // namespace ml_metadata
diff --git a/ml_metadata/metadata_store/sqlite_metadata_source_test.cc b/ml_metadata/metadata_store/sqlite_metadata_source_test.cc
@@ -16,10 +16,8 @@ limitations under the License.
 
 #include <memory>
 
-#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "absl/memory/memory.h"
 #include "ml_metadata/metadata_store/metadata_source_test_suite.h"
 #include "ml_metadata/metadata_store/test_util.h"
 
@@ -93,6 +91,6 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::Values([]() {
       return std::make_unique<SqliteMetadataSourceContainer>();
     }));
-
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MetadataSourceTestSuite);
 }  // namespace testing
 }  // namespace ml_metadata
diff --git a/ml_metadata/metadata_store/sqlite_query_config_executor_test.cc b/ml_metadata/metadata_store/sqlite_query_config_executor_test.cc
@@ -64,6 +64,6 @@ INSTANTIATE_TEST_SUITE_P(
     SqliteQueryConfigExecutorTest, QueryExecutorTest, ::testing::Values([]() {
       return std::make_unique<SqliteQueryConfigExecutorContainer>();
     }));
-
+  GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(QueryExecutorTest);
 }  // namespace testing
 }  // namespace ml_metadata
diff --git a/ml_metadata/metadata_store/sqlite_rdbms_metadata_access_object_test.cc b/ml_metadata/metadata_store/sqlite_rdbms_metadata_access_object_test.cc
@@ -85,6 +85,6 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::Values([]() {
       return std::make_unique<SqliteRDBMSMetadataAccessObjectContainer>();
     }));
-
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(RDBMSMetadataAccessObjectTest);
 }  // namespace testing
 }  // namespace ml_metadata
diff --git a/ml_metadata/third_party/sqlite.BUILD b/ml_metadata/third_party/sqlite.BUILD
@@ -6,7 +6,7 @@ licenses(["unencumbered"])  # Public Domain
 config_setting(
     name = "macos",
     constraint_values = [
-        "@bazel_tools//platforms:osx",
+        "@platforms//os:osx",
     ],
 )
 

diff --git a/ml_metadata/tools/dev_debug/Dockerfile b/ml_metadata/tools/dev_debug/Dockerfile
@@ -34,8 +34,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
   python-is-python3 \
   python3-dev
 
-# Set up Bazel 5.3.0
-ENV BAZEL_VERSION 5.3.0
+# Set up Bazel 6.1.0
+ENV BAZEL_VERSION 6.1.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \

diff --git a/ml_metadata/tools/docker_build/Dockerfile.manylinux2010 b/ml_metadata/tools/docker_build/Dockerfile.manylinux2010
@@ -15,6 +15,6 @@
 # Dockerfile for building a manylinux2010 MLMD wheel.
 
 # This docker image is essentially pypa/manylinux2010 + bazel.
-FROM gcr.io/tfx-oss-public/manylinux2014-bazel:bazel-5.3.0
+FROM gcr.io/tfx-oss-public/manylinux2014-bazel:bazel-6.1.0
 WORKDIR /build
 CMD ["ml_metadata/tools/docker_build/build_manylinux.sh"]
diff --git a/ml_metadata/tools/docker_server/Dockerfile b/ml_metadata/tools/docker_server/Dockerfile
@@ -14,7 +14,7 @@
 
 # TODO(b/195701120) Introduces l.gcr.io/google/bazel:5.3.0 when it is available
 # and makes sure that it uses ubuntu 20.04 as base image. Currently the lastest
-# version only supports bazel 3.5.0.
+# version only supports bazel 6.1.0.
 FROM ubuntu:20.04 as builder
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -35,8 +35,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
   python-is-python3 \
   python3-dev
 
-# Set up Bazel 5.3.0
-ENV BAZEL_VERSION 5.3.0
+# Set up Bazel 6.1.0
+ENV BAZEL_VERSION 6.1.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \