From b57ac853e8cc242b09eaeee622e4e47049e93df1 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Mon, 11 Nov 2024 11:35:55 -0800 Subject: [PATCH 01/11] raise protobuf dep for workspace --- python/private/py_repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index 6283ad7cb..c052b794b 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -63,8 +63,8 @@ def py_repositories(): # 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", + sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", + strip_prefix = "protobuf-29.0-rc2", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", ) pypi_deps() From b5bef72c2cf2b172c02bd5ed4aa9a755dfac0a35 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Mon, 11 Nov 2024 12:01:39 -0800 Subject: [PATCH 02/11] disable bazel_rolling test, go back to protobuf 27 for workspace --- python/private/py_repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index c052b794b..6283ad7cb 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -63,8 +63,8 @@ def py_repositories(): # Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl http_archive( name = "protobuf", - sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", - strip_prefix = "protobuf-29.0-rc2", - url = "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", + sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", + strip_prefix = "protobuf-27.0", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", ) pypi_deps() From ddfb3af2c0ae126c72cc5a14642bb313f4a2ef73 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 11 Oct 2024 07:28:03 +0200 Subject: [PATCH 03/11] Upgrade rules_cc in WORKSPACE --- internal_deps.bzl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal_deps.bzl b/internal_deps.bzl index 33decba9f..65c0c6aac 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -234,3 +234,10 @@ 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", + ) From 3b5d8fab6c475ac7145b22f5bd647665c52586b3 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 11 Oct 2024 07:42:05 +0200 Subject: [PATCH 04/11] Add protobuf dependency --- internal_deps.bzl | 7 +++++++ python/private/py_repositories.bzl | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/internal_deps.bzl b/internal_deps.bzl index 65c0c6aac..3b28aff94 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -241,3 +241,10 @@ def rules_python_internal_deps(): 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( + name = "protobuf", + sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", + strip_prefix = "protobuf-27.0", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", + ) diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index 6283ad7cb..9cfa73fde 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -60,6 +60,13 @@ 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", From c500a69cf22358d9c14eb28a7369c2264b6ae16e Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sat, 19 Oct 2024 19:08:16 -0700 Subject: [PATCH 05/11] fixup! Merge remote-tracking branch 'upstream/main' into remove-cc-defs --- internal_deps.bzl | 1 + python/private/py_repositories.bzl | 1 + 2 files changed, 2 insertions(+) diff --git a/internal_deps.bzl b/internal_deps.bzl index 3b28aff94..ec0a8f0cf 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -241,6 +241,7 @@ def rules_python_internal_deps(): 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( name = "protobuf", diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index 9cfa73fde..8a5d0969b 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -67,6 +67,7 @@ def py_repositories(): 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", From 2722e295a6be0c1851323cbea788781dac402fb8 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Mon, 11 Nov 2024 17:40:51 -0800 Subject: [PATCH 06/11] try to use protobuf 29 in workspace for bazel 9 --- MODULE.bazel | 2 +- examples/bzlmod/MODULE.bazel | 2 +- internal_deps.bzl | 7 ----- python/private/py_repositories.bzl | 8 ------ .../py_cc_toolchain_registered/WORKSPACE | 27 +++++++++++++++++++ 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f9f173d8f..ef173bc83 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 2843575c3..397129a76 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 ec0a8f0cf..319bdf877 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 8a5d0969b..6283ad7cb 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 de908549c..140e28c34 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() From 5c0ceb4b8cad6b1fa5fa597673c3d00f34508247 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Wed, 13 Nov 2024 20:25:49 -0800 Subject: [PATCH 07/11] add protobuf dep to py_repositories --- examples/bzlmod/MODULE.bazel | 2 +- internal_deps.bzl | 16 ++++++++-------- python/private/py_repositories.bzl | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel index 397129a76..2843575c3 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.2") +bazel_dep(name = "rules_proto", version = "6.0.0-rc1") # (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 319bdf877..8bf5df783 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -185,6 +185,14 @@ def rules_python_internal_deps(): ], ) + # 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 for stardoc http_archive( name = "rules_java", @@ -234,11 +242,3 @@ 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", - ) diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index 6283ad7cb..a796869c8 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -60,11 +60,19 @@ 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 + ### 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-29.0", + ## url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", + ##) 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", + sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", + strip_prefix = "protobuf-29.0-rc2", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", + ], ) pypi_deps() From e391fcadb8331af83caa59fc6852610aa19776f8 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Wed, 13 Nov 2024 20:30:51 -0800 Subject: [PATCH 08/11] go back ot proto 27 for workspace --- python/private/py_repositories.bzl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index a796869c8..a35bf0f5c 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -61,18 +61,19 @@ def py_repositories(): ) ### 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-29.0", - ## url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", - ##) http_archive( name = "protobuf", - sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", - strip_prefix = "protobuf-29.0-rc2", - urls = [ - "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", - ], + sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa", + strip_prefix = "protobuf-27.0", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz", ) + + ##http_archive( + ## name = "protobuf", + ## sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", + ## strip_prefix = "protobuf-29.0-rc2", + ## urls = [ + ## "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", + ## ], + ##) pypi_deps() From 13f121eb4dd07af7e21998f3823072165cdf3071 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Wed, 13 Nov 2024 20:41:28 -0800 Subject: [PATCH 09/11] undo other workspace changes --- internal_deps.bzl | 12 ++--- .../py_cc_toolchain_registered/WORKSPACE | 48 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal_deps.bzl b/internal_deps.bzl index 8bf5df783..1381fc920 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -186,12 +186,12 @@ def rules_python_internal_deps(): ) # 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", - ) + ##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 for stardoc http_archive( diff --git a/tests/integration/py_cc_toolchain_registered/WORKSPACE b/tests/integration/py_cc_toolchain_registered/WORKSPACE index 140e28c34..07c3e9416 100644 --- a/tests/integration/py_cc_toolchain_registered/WORKSPACE +++ b/tests/integration/py_cc_toolchain_registered/WORKSPACE @@ -5,30 +5,30 @@ local_repository( 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", - ], -) +##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") From 58d68675e09a80f43f82ac8d2a3f860281bc6924 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Wed, 13 Nov 2024 21:01:45 -0800 Subject: [PATCH 10/11] fully remove other workspace changes --- internal_deps.bzl | 8 ------ python/private/py_repositories.bzl | 11 +------- .../py_cc_toolchain_registered/WORKSPACE | 27 ------------------- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/internal_deps.bzl b/internal_deps.bzl index 1381fc920..33decba9f 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -185,14 +185,6 @@ def rules_python_internal_deps(): ], ) - # 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 for stardoc http_archive( name = "rules_java", diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl index a35bf0f5c..6283ad7cb 100644 --- a/python/private/py_repositories.bzl +++ b/python/private/py_repositories.bzl @@ -60,20 +60,11 @@ 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 + # 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", ) - - ##http_archive( - ## name = "protobuf", - ## sha256 = "ce5d00b78450a0ca400bf360ac00c0d599cc225f049d986a27e9a4e396c5a84a", - ## strip_prefix = "protobuf-29.0-rc2", - ## urls = [ - ## "https://github.com/protocolbuffers/protobuf/releases/download/v29.0-rc2/protobuf-29.0-rc2.tar.gz", - ## ], - ##) pypi_deps() diff --git a/tests/integration/py_cc_toolchain_registered/WORKSPACE b/tests/integration/py_cc_toolchain_registered/WORKSPACE index 07c3e9416..de908549c 100644 --- a/tests/integration/py_cc_toolchain_registered/WORKSPACE +++ b/tests/integration/py_cc_toolchain_registered/WORKSPACE @@ -1,35 +1,8 @@ -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() From e0c433a1219fded15be85dc3e92b2bcf982d2aac Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Wed, 13 Nov 2024 21:05:31 -0800 Subject: [PATCH 11/11] update bzlmod lockfile --- examples/bzlmod/MODULE.bazel.lock | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/bzlmod/MODULE.bazel.lock b/examples/bzlmod/MODULE.bazel.lock index ee745d56d..5a546c2f7 100644 --- a/examples/bzlmod/MODULE.bazel.lock +++ b/examples/bzlmod/MODULE.bazel.lock @@ -66,6 +66,7 @@ "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc", "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c", + "https://bcr.bazel.build/modules/protobuf/27.1/MODULE.bazel": "703a7b614728bb06647f965264967a8ef1c39e09e8f167b3ca0bb1fd80449c0d", "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df", "https://bcr.bazel.build/modules/protobuf/29.0-rc2/source.json": "52101bfd37e38f0d159dee47b71ccbd1f22f7a32192cef5ef2533bb6212f410f", "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", @@ -83,7 +84,8 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", "https://bcr.bazel.build/modules/rules_cc/0.0.14/MODULE.bazel": "5e343a3aac88b8d7af3b1b6d2093b55c347b8eefc2e7d1442f7a02dc8fea48ac", - "https://bcr.bazel.build/modules/rules_cc/0.0.14/source.json": "d22ad7e0f2c271a583b463b81cea83fd8afbf0012cad955c129b0e85662ec207", + "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc", + "https://bcr.bazel.build/modules/rules_cc/0.0.15/source.json": "48e606af0e02a716974a8b74fba6988d9f0c93af9177e28cf474bfc5fa26ab10", "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c", "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f", "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", @@ -132,7 +134,8 @@ "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7", "https://bcr.bazel.build/modules/rules_proto/6.0.0-rc1/MODULE.bazel": "1e5b502e2e1a9e825eef74476a5a1ee524a92297085015a052510b09a1a09483", "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73", - "https://bcr.bazel.build/modules/rules_proto/6.0.2/source.json": "17a2e195f56cb28d6bbf763e49973d13890487c6945311ed141e196fb660426d", + "https://bcr.bazel.build/modules/rules_proto/7.0.2/MODULE.bazel": "bf81793bd6d2ad89a37a40693e56c61b0ee30f7a7fdbaf3eabbf5f39de47dea2", + "https://bcr.bazel.build/modules/rules_proto/7.0.2/source.json": "1e5e7260ae32ef4f2b52fd1d0de8d03b606a44c91b694d2f1afb1d3b28a48ce1", "https://bcr.bazel.build/modules/rules_rust/0.54.1/MODULE.bazel": "388547bb0cd6a751437bb15c94c6725226f50100eec576e4354c3a8b48c754fb", "https://bcr.bazel.build/modules/rules_rust/0.54.1/source.json": "9c5481b1abe4943457e6b2a475592d2e504b6b4355df603f24f64cde0a7f0f2d", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",