Loosen py_proto_library check for paths with hyphens to exclude import prefixes (i.e. external/module-name) .

These do not actually make it into the name used in python imports, so this should allow modules with hyphens in their name (i.e. `bazel build @com_google_protobuf-examples//:addressbook_py_pb2).

PiperOrigin-RevId: 732189971

Author: zhangskz

.github/workflows/test_bazel.yml

@@ -51,7 +51,16 @@ jobs:
         shell: bash
         run: echo "${{ matrix.bazelversion }}" > .bazelversion
 
-      - name: Run tests
+     - name: Run tests
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
+        uses: protocolbuffers/protobuf-ci/bazel@v4
+        with:
+          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
+          bazel-cache: examples-from-protobuf
+          version: ${{ matrix.bazelversion }}
+          bash: bazel test @com_google_protobuf-examples//... $BAZEL_FLAGS --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }} ${{ matrix.toolchain_resolution }}
+
+      - name: Run tests (examples)
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel@v4
         with:

MODULE.bazel

@@ -134,3 +134,9 @@ use_repo(cc_configure, "local_config_cc")
 
 # rules_proto are needed for @com_google_protobuf_v25.0 used in //compatibility/... tests
 bazel_dep(name = "rules_proto", version = "4.0.0", dev_dependency = True)
+
+bazel_dep(name = "com_google_protobuf-examples", version = "0.0.0")
+local_path_override(
+    module_name = "com_google_protobuf-examples",
+    path = "examples/",
+)

bazel/py_proto_library.bzl

@@ -44,8 +44,9 @@ def _py_proto_aspect_impl(target, ctx):
 
     # Check Proto file names
     for proto in target[ProtoInfo].direct_sources:
-        if proto.is_source and "-" in proto.dirname:
-            fail("Cannot generate Python code for a .proto whose path contains '-' ({}).".format(
+        import_path = proto_common.get_import_path(proto)
+        if proto.is_source and "-" in import_path:
+            fail("Cannot generate Python code for a .proto whose python import path contains '-' ({}).".format(
                 proto.path,
             ))
 

examples/MODULE.bazel

@@ -1,7 +1,7 @@
 """Bazel module dependencies"""
 
 module(
-    name = "com_google_protobuf_examples",
+    name = "com_google_protobuf-examples",
     version = "0.0.0",
     compatibility_level = 1,
 )

examples/WORKSPACE

@@ -1,4 +1,4 @@
-workspace(name = "com_google_protobuf_examples")
+workspace(name = "com_google_protobuf-examples")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")