Configure protobuf in all WORKSPACES

comius · comius · commit d61379ff7dac · 2024-11-20T17:47:08.000+01:00
diff --git a/examples/build_file_generation/WORKSPACE b/examples/build_file_generation/WORKSPACE
@@ -137,4 +137,3 @@ _py_gazelle_deps()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/examples/multi_python_versions/WORKSPACE b/examples/multi_python_versions/WORKSPACE
@@ -66,4 +66,3 @@ rules_shell_toolchains()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/examples/pip_parse/WORKSPACE b/examples/pip_parse/WORKSPACE
@@ -63,3 +63,9 @@ load("@pypi//:requirements.bzl", "install_deps")
 
 # Initialize repositories for all packages in requirements_lock.txt.
 install_deps()
+
+# Needed by rules_cc
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
diff --git a/examples/pip_parse_vendored/WORKSPACE b/examples/pip_parse_vendored/WORKSPACE
@@ -44,4 +44,3 @@ install_deps()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/examples/pip_repository_annotations/WORKSPACE b/examples/pip_repository_annotations/WORKSPACE
@@ -65,4 +65,3 @@ install_deps()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/gazelle/WORKSPACE b/gazelle/WORKSPACE
@@ -47,4 +47,3 @@ _py_gazelle_deps()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/tests/integration/compile_pip_requirements/WORKSPACE b/tests/integration/compile_pip_requirements/WORKSPACE
@@ -16,4 +16,3 @@ python_register_toolchains(
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/tests/integration/compile_pip_requirements_test_from_external_repo/WORKSPACE b/tests/integration/compile_pip_requirements_test_from_external_repo/WORKSPACE
@@ -29,3 +29,9 @@ load("@pypi//:requirements.bzl", "install_deps")
 
 # Initialize repositories for all packages in requirements_lock.txt.
 install_deps()
+
+# Needed by rules_cc
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
diff --git a/tests/integration/custom_commands/WORKSPACE b/tests/integration/custom_commands/WORKSPACE
@@ -16,4 +16,3 @@ python_register_toolchains(
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/tests/integration/ignore_root_user_error/WORKSPACE b/tests/integration/ignore_root_user_error/WORKSPACE
@@ -32,4 +32,3 @@ bazel_skylib_workspace()
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-
diff --git a/tests/integration/py_cc_toolchain_registered/WORKSPACE b/tests/integration/py_cc_toolchain_registered/WORKSPACE
@@ -16,4 +16,3 @@ python_register_toolchains(
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
-

Original file line number	Diff line number	Diff line change
`@@ -137,4 +137,3 @@ _py_gazelle_deps()`
`137`	`137`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`138`	`138`
`139`	`139`	`protobuf_deps()`
`140`		`-`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,3 @@ rules_shell_toolchains()`
`66`	`66`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`67`	`67`
`68`	`68`	`protobuf_deps()`
`69`		`-`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,3 @@ install_deps()`
`44`	`44`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`45`	`45`
`46`	`46`	`protobuf_deps()`
`47`		`-`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,3 @@ install_deps()`
`65`	`65`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`66`	`66`
`67`	`67`	`protobuf_deps()`
`68`		`-`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,3 @@ _py_gazelle_deps()`
`47`	`47`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`48`	`48`
`49`	`49`	`protobuf_deps()`
`50`		`-`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@ python_register_toolchains(`
`16`	`16`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`17`	`17`
`18`	`18`	`protobuf_deps()`
`19`		`-`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,3 @@ bazel_skylib_workspace()`
`32`	`32`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
`33`	`33`
`34`	`34`	`protobuf_deps()`
`35`		`-`