_proto_py_pb2 -> _py_pb2

shaldengeki · shaldengeki · commit b0039ee9ce8a · 2025-07-13T14:20:49.000-04:00
diff --git a/examples/bzlmod/py_proto_library/BUILD.bazel b/examples/bzlmod/py_proto_library/BUILD.bazel
@@ -6,15 +6,15 @@ py_test(
     srcs = ["test.py"],
     main = "test.py",
     deps = [
-        "//py_proto_library/example.com/proto:pricetag_proto_py_pb2",
+        "//py_proto_library/example.com/proto:pricetag_py_pb2",
     ],
 )
 
 py_test(
     name = "message_test",
     srcs = ["message_test.py"],
     deps = [
-        "//py_proto_library/example.com/another_proto:message_proto_py_pb2",
+        "//py_proto_library/example.com/another_proto:message_py_pb2",
     ],
 )
 
diff --git a/examples/bzlmod/py_proto_library/example.com/another_proto/BUILD.bazel b/examples/bzlmod/py_proto_library/example.com/another_proto/BUILD.bazel
@@ -2,7 +2,7 @@ load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 py_proto_library(
-    name = "message_proto_py_pb2",
+    name = "message_py_pb2",
     visibility = ["//visibility:public"],
     deps = [":message_proto"],
 )
diff --git a/examples/bzlmod/py_proto_library/example.com/proto/BUILD.bazel b/examples/bzlmod/py_proto_library/example.com/proto/BUILD.bazel
@@ -2,7 +2,7 @@ load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 py_proto_library(
-    name = "pricetag_proto_py_pb2",
+    name = "pricetag_py_pb2",
     visibility = ["//visibility:public"],
     deps = [":pricetag_proto"],
 )
diff --git a/examples/py_proto_library/BUILD.bazel b/examples/py_proto_library/BUILD.bazel
@@ -5,14 +5,14 @@ py_test(
     srcs = ["test.py"],
     main = "test.py",
     deps = [
-        "//example.com/proto:pricetag_proto_py_pb2",
+        "//example.com/proto:pricetag_py_pb2",
     ],
 )
 
 py_test(
     name = "message_test",
     srcs = ["message_test.py"],
     deps = [
-        "//example.com/another_proto:message_proto_py_pb2",
+        "//example.com/another_proto:message_py_pb2",
     ],
 )
diff --git a/examples/py_proto_library/example.com/another_proto/BUILD.bazel b/examples/py_proto_library/example.com/another_proto/BUILD.bazel
@@ -2,7 +2,7 @@ load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 py_proto_library(
-    name = "message_proto_py_pb2",
+    name = "message_py_pb2",
     visibility = ["//visibility:public"],
     deps = [":message_proto"],
 )
diff --git a/examples/py_proto_library/example.com/proto/BUILD.bazel b/examples/py_proto_library/example.com/proto/BUILD.bazel
@@ -2,7 +2,7 @@ load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 py_proto_library(
-    name = "pricetag_proto_py_pb2",
+    name = "pricetag_py_pb2",
     visibility = ["//visibility:public"],
     deps = [":pricetag_proto"],
 )
diff --git a/gazelle/README.md b/gazelle/README.md
@@ -513,7 +513,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/generate.go b/gazelle/python/generate.go
@@ -580,7 +580,7 @@ func generateProtoLibraries(args language.GenerateArgs, pythonProjectRoot string
 	emptySiblings := treeset.Set{}
 	// Generate a py_proto_library for each proto_library.
 	for _, protoRuleName := range protoRuleNames {
-		pyProtoLibraryName := protoRuleName + "_py_pb2"
+		pyProtoLibraryName := strings.TrimSuffix(protoRuleName, "_proto") + "_py_pb2"
 		pyProtoLibrary := newTargetBuilder(pyProtoLibraryKind, pyProtoLibraryName, pythonProjectRoot, args.Rel, &emptySiblings).
 			addVisibility(visibility).
 			addResolvedDependency(":" + protoRuleName).
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test5_enabled_with_proto/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto/test5_enabled_with_proto/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test7_removes_when_unnecessary/BUILD.in b/gazelle/python/testdata/directive_python_generate_proto/test7_removes_when_unnecessary/BUILD.in
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.in b/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.in
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto_bzlmod_protobuf/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto_bzlmod_protobuf/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto_bzlmod_protobuf_renamed/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto_bzlmod_protobuf_renamed/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_pb2",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")`
`2`	`2`	`load("@rules_python//python:proto.bzl", "py_proto_library")`
`3`	`3`
`4`	`4`	`py_proto_library(`
`5`		`- name = "message_proto_py_pb2",`
	`5`	`+ name = "message_py_pb2",`
`6`	`6`	`visibility = ["//visibility:public"],`
`7`	`7`	`deps = [":message_proto"],`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ proto_library(`
`513`	`513`	`)`
`514`	`514`
`515`	`515`	`py_proto_library(`
`516`		`- name = "foo_proto_py_pb2",`
	`516`	`+ name = "foo_py_pb2",`
`517`	`517`	`visibility = ["//:__subpackages__"],`
`518`	`518`	`deps = [":foo_proto"],`
`519`	`519`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ proto_library(`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`py_proto_library(`
`13`		`- name = "foo_proto_py_pb2",`
	`13`	`+ name = "foo_py_pb2",`
`14`	`14`	`visibility = ["//:__subpackages__"],`
`15`	`15`	`deps = [":foo_proto"],`
`16`	`16`	`)`