diff --git a/MODULE.bazel b/MODULE.bazel index f9f173d8f1..ef173bc83b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ bazel_dep(name = "rules_cc", version = "0.0.14") bazel_dep(name = "platforms", version = "0.0.4") # Those are loaded only when using py_proto_library -bazel_dep(name = "rules_proto", version = "6.0.2") +bazel_dep(name = "rules_proto", version = "7.0.2") bazel_dep(name = "protobuf", version = "29.0-rc2", repo_name = "com_google_protobuf") internal_deps = use_extension("//python/private:internal_deps.bzl", "internal_deps") diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel index 2843575c31..397129a768 100644 --- a/examples/bzlmod/MODULE.bazel +++ b/examples/bzlmod/MODULE.bazel @@ -12,7 +12,7 @@ local_path_override( ) # (py_proto_library specific) We are using rules_proto to define rules_proto targets to be consumed by py_proto_library. -bazel_dep(name = "rules_proto", version = "6.0.0-rc1") +bazel_dep(name = "rules_proto", version = "6.0.2") # (py_proto_library specific) Add the protobuf library for well-known types (e.g. `Any`, `Timestamp`, etc) bazel_dep(name = "protobuf", version = "27.0", repo_name = "com_google_protobuf") diff --git a/internal_deps.bzl b/internal_deps.bzl index ec0a8f0cf6..319bdf877c 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -234,13 +234,6 @@ def rules_python_internal_deps(): sha256 = "0e124567fa85287874eff33a791c3bbdcc5343329a56faa828ef624380d4607c", url = "https://github.com/keith/rules_multirun/releases/download/0.9.0/rules_multirun.0.9.0.tar.gz", ) - # Needed by rules_cc, triggered by @rules_java_builtins from Bazel - http_archive( - name = "protobuf", - sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", - strip_prefix = "protobuf-27.0", - url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", - ) # Needed by rules_cc, triggered by @rules_java_builtins from Bazel http_archive( diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index 8a5d0969ba..6283ad7cbc 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -60,14 +60,6 @@ def py_repositories(): urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.13/rules_cc-0.0.13.tar.gz"], ) - # Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl - http_archive( - name = "protobuf", - sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", - strip_prefix = "protobuf-27.0", - url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", - ) - # Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl http_archive( name = "protobuf", diff --git a/tests/integration/py_cc_toolchain_registered/WORKSPACE b/tests/integration/py_cc_toolchain_registered/WORKSPACE index de908549c0..140e28c344 100644 --- a/tests/integration/py_cc_toolchain_registered/WORKSPACE +++ b/tests/integration/py_cc_toolchain_registered/WORKSPACE @@ -1,8 +1,35 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + local_repository( name = "rules_python", path = "../../..", ) +http_archive( + name = "proto_bazel_features", + sha256 = "d7787da289a7fb497352211ad200ec9f698822a9e0757a4976fd9f713ff372b3", + strip_prefix = "bazel_features-1.9.1", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.9.1/bazel_features-v1.9.1.tar.gz", +) + +http_archive( + name = "com_google_protobuf", + ##sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", + strip_prefix = "protobuf-29.0-rc2", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", + ], +) + +http_archive( + name = "protobuf", + ##sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", + strip_prefix = "protobuf-29.0-rc2", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", + ], +) + load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") py_repositories()