Merge branch 'main' into drop-pkg-resources-packaging

Author: daniel-sanche

.github/.OwlBot.lock.yaml

@@ -0,0 +1,10 @@
+image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:4e3486fee9eba44b75a18c67f0c60fa0c4af675132305e3ff3fae2e9b94f94bb
+libraries:
+  - id: gapic-generator
+    version: 1.29.0
+    apis: []
+    source_roots:
+      - .
+    preserve_regex: []
+    remove_regex: []
+    tag_format: v{version}

.github/.OwlBot.yaml

@@ -1,5 +1,9 @@
 # Changelog
 
+[PyPI History][1]
+
+[1]: https://pypi.org/project/gapic-generator/#history
+
 
 ## [1.29.0](https://github.com/googleapis/gapic-generator-python/compare/v1.28.3...v1.29.0) (2025-10-23)
 

.github/release-please.yml

@@ -676,6 +676,9 @@ def gapic_metadata(self, options: Options) -> gapic_metadata_pb2.GapicMetadata:
         for service in sorted(self.services.values(), key=lambda s: s.name):
             service_desc = gm.services.get_or_create(service.name)
 
+            if service.version:
+                service_desc.api_version = service.version
+
             # At least one of "grpc" or "rest" is guaranteed to be present because
             # of the way that Options instances are created.
             # This assumes the options are generated by the class method factory.

.github/release-trigger.yml

@@ -54,7 +54,10 @@
 def unit(session):
     """Run the unit test suite."""
     session.install(
-        "coverage",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2478):
+        # Temporarily pin coverage to 7.11.0
+        # See https://github.com/nedbat/coveragepy/issues/2077
+        "coverage<=7.11.0",
         "pytest-cov",
         "pytest",
         "pytest-xdist",

.librarian/state.yaml

@@ -1908,6 +1908,10 @@ def test_map_field_name_disambiguation():
 
 
 def test_gapic_metadata():
+    apiVersion = "2025-11-03"
+    serviceOptions = descriptor_pb2.ServiceOptions()
+    serviceOptions.Extensions[client_pb2.api_version] = apiVersion
+
     api_schema = api.API.build(
         file_descriptors=[
             descriptor_pb2.FileDescriptorProto(
@@ -1941,6 +1945,7 @@ def test_gapic_metadata():
                                 output_type="animalia.mollusca.v1.Mollusc",
                             ),
                         ],
+                        options=serviceOptions,
                     ),
                     descriptor_pb2.ServiceDescriptorProto(
                         name="Octopus",
@@ -1997,6 +2002,7 @@ def test_gapic_metadata():
                 }
             ),
             "Squid": gapic_metadata_pb2.GapicMetadata.ServiceForTransport(
+                api_version=apiVersion,
                 clients={
                     "grpc": gapic_metadata_pb2.GapicMetadata.ServiceAsClient(
                         library_client="SquidClient",
@@ -2026,7 +2032,7 @@ def test_gapic_metadata():
                             ),
                         },
                     ),
-                }
+                },
             ),
         },
     )
@@ -2060,6 +2066,7 @@ def test_gapic_metadata():
                 }
             ),
             "Squid": gapic_metadata_pb2.GapicMetadata.ServiceForTransport(
+                api_version=apiVersion,
                 clients={
                     "rest": gapic_metadata_pb2.GapicMetadata.ServiceAsClient(
                         library_client="SquidClient",
@@ -2075,7 +2082,7 @@ def test_gapic_metadata():
                             ),
                         },
                     ),
-                }
+                },
             ),
         },
     )
@@ -2131,6 +2138,7 @@ def test_gapic_metadata():
                 }
             ),
             "Squid": gapic_metadata_pb2.GapicMetadata.ServiceForTransport(
+                api_version=apiVersion,
                 clients={
                     "grpc": gapic_metadata_pb2.GapicMetadata.ServiceAsClient(
                         library_client="SquidClient",
@@ -2174,7 +2182,7 @@ def test_gapic_metadata():
                             ),
                         },
                     ),
-                }
+                },
             ),
         },
     )