Merge branch 'main' into run-mypy-on-fragments-latest

Author: daniel-sanche

.librarian/state.yaml

@@ -1,7 +1,7 @@
 image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:68c7c79adf43af1be4c0527673342dd180aebebf652ea623614eaebff924ca27
 libraries:
   - id: gapic-generator
-    version: 1.30.10
+    version: 1.30.13
     last_generated_commit: ""
     apis: []
     source_roots:

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 [1]: https://pypi.org/project/gapic-generator/#history
 
+## [1.30.13](https://github.com/googleapis/gapic-generator-python/compare/v1.30.12...v1.30.13) (2026-03-13)
+
+## [1.30.12](https://github.com/googleapis/gapic-generator-python/compare/v1.30.11...v1.30.12) (2026-03-12)
+
+## [1.30.11](https://github.com/googleapis/gapic-generator-python/compare/v1.30.10...v1.30.11) (2026-03-11)
+
 ## [1.30.10](https://github.com/googleapis/gapic-generator-python/compare/v1.30.9...v1.30.10) (2026-03-09)
 
 

gapic/templates/_pypi_packages.j2

@@ -4,16 +4,15 @@ Where the first <tuple> contains the API, including the version and the second
 tuple contains the PyPI package name, the minimum allowed version and the maximum
 allowed version.
 
-Note: Set the minimum version for google-cloud-documentai to 2.0.0 which has support for `barcode` in `google.cloud.documentai.types`
 -->
 {% set pypi_packages = {
     ("google", "apps", "card", "v1"): {"package_name": "google-apps-card", "lower_bound": "0.3.0", "upper_bound": "1.0.0"},
     ("google", "apps", "script", "type"): {"package_name": "google-apps-script-type", "lower_bound": "0.2.0", "upper_bound": "1.0.0"},
     ("google", "geo", "type"): {"package_name": "google-geo-type", "lower_bound": "0.1.0", "upper_bound": "1.0.0"},
-    ("google", "identity", "accesscontextmanager", "v1"): {"package_name": "google-cloud-access-context-manager", "lower_bound": "0.1.2", "upper_bound": "1.0.0"},
-    ("google", "cloud", "documentai", "v1"): {"package_name": "google-cloud-documentai", "lower_bound": "2.0.0", "upper_bound": "4.0.0"},
-    ("google", "cloud", "kms", "v1"): {"package_name": "google-cloud-kms", "lower_bound": "2.3.0", "upper_bound": "4.0.0"},
-    ("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.0.0", "upper_bound": "2.0.0"},
+    ("google", "identity", "accesscontextmanager", "v1"): {"package_name": "google-cloud-access-context-manager", "lower_bound": "0.2.0", "upper_bound": "1.0.0"},
+    ("google", "cloud", "documentai", "v1"): {"package_name": "google-cloud-documentai", "lower_bound": "2.4.1", "upper_bound": "4.0.0"},
+    ("google", "cloud", "kms", "v1"): {"package_name": "google-cloud-kms", "lower_bound": "2.13.0", "upper_bound": "4.0.0"},
+    ("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.13.0", "upper_bound": "2.0.0"},
     ("google", "iam", "v1"): {"package_name": "grpc-google-iam-v1", "lower_bound": "0.14.0", "upper_bound": "1.0.0"},
     ("google", "iam", "v2"): {"package_name": "google-cloud-iam", "lower_bound": "2.12.2", "upper_bound": "3.0.0"},
     ("google", "shopping", "type"): {"package_name": "google-shopping-type", "lower_bound": "1.0.0", "upper_bound": "2.0.0"}

gapic/templates/examples/feature_fragments.j2

@@ -230,7 +230,7 @@ request=request
 {# Note: this doesn't deal with enums or unions #}
 {# LROs return operation objects and paged requests return pager objects #}
 {% if transport == "grpc-async" and calling_form not in
-[calling_form_enum.LongRunningRequestPromise, calling_form_enum.RequestPagedAll] %}
+[calling_form_enum.RequestPaged, calling_form_enum.RequestPagedAll] %}
 await{{ " "}}
 {%- endif -%}
 {% if calling_form in [calling_form_enum.RequestStreamingBidi,
@@ -242,13 +242,6 @@ client.{{ render_method_name(sample)|trim }}({{ render_request_params_unary(samp
 {% endif %}
 {% endmacro %}
 
-{% macro operation_text(transport) %}
-{% if transport == "grpc-async" %}
-(await operation)
-{% else %}
-operation
-{% endif %}
-{% endmacro %}
 
 {# Setting up the method invocation is the responsibility of the caller: #}
 {# it's just easier to set up client side streaming and other things from outside this macro. #}
@@ -294,9 +287,7 @@ operation = {{ method_invocation_text|trim }}
 
 print("Waiting for operation to complete...")
 
-{% with operation_text = operation_text(transport) %}
-response = {{ operation_text|trim }}.result()
-{% endwith %}
+response = {% if transport == "grpc-async" %}await {% endif %}operation.result()
 
 # Handle the response
 {% for statement in response_statements %}

gapic/templates/noxfile.py.j2

@@ -87,8 +87,10 @@ nox.options.error_on_missing_interpreters = True
 @nox.session(python=ALL_PYTHON)
 def mypy(session):
     """Run the type checker."""
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2579):
+    # use the latest version of mypy
     session.install(
-        "mypy",
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )
@@ -246,27 +248,16 @@ def install_unittest_dependencies(session, *constraints):
 @nox.session(python=ALL_PYTHON)
 @nox.parametrize(
     "protobuf_implementation",
-    ["python", "upb", "cpp"],
+    ["python", "upb"],
 )
 def unit(session, protobuf_implementation):
     # Install all test dependencies, then install this package in-place.
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove this check once support for Protobuf 3.x is dropped.
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13", "3.14"):
-        session.skip("cpp implementation is not supported in python 3.11+")
-
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
     install_unittest_dependencies(session, "-c", constraints_path)
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
-    # The 'cpp' implementation requires Protobuf<4.
-    if protobuf_implementation == "cpp":
-        session.install("protobuf<4")
-
     # Run py.test against the unit tests.
     session.run(
         "py.test",
@@ -461,7 +452,7 @@ def docfx(session):
 @nox.session(python=PREVIEW_PYTHON_VERSION)
 @nox.parametrize(
     "protobuf_implementation",
-    ["python", "upb", "cpp"],
+    ["python", "upb"],
 )
 def prerelease_deps(session, protobuf_implementation):
     """
@@ -471,11 +462,6 @@ def prerelease_deps(session, protobuf_implementation):
     `pip install --pre <package>`.
     """
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove this check once support for Protobuf 3.x is dropped.
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13", "3.14"):
-        session.skip("cpp implementation is not supported in python 3.11+")
-
     # Install all dependencies
     session.install("-e", ".")
 

setup.py

@@ -22,7 +22,7 @@
 name = "gapic-generator"
 description = "Google API Client Generator for Python"
 url = "https://github.com/googleapis/gapic-generator-python"
-version = "1.30.10"
+version = "1.30.13"
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
     # Ensure that the lower bounds of these dependencies match what we have in the

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py

@@ -322,11 +322,11 @@ async def sample_export_assets():
                 )
 
                 # Make the request
-                operation = client.export_assets(request=request)
+                operation = await client.export_assets(request=request)
 
                 print("Waiting for operation to complete...")
 
-                response = (await operation).result()
+                response = await operation.result()
 
                 # Handle the response
                 print(response)
@@ -1727,11 +1727,11 @@ async def sample_analyze_iam_policy_longrunning():
                 )
 
                 # Make the request
-                operation = client.analyze_iam_policy_longrunning(request=request)
+                operation = await client.analyze_iam_policy_longrunning(request=request)
 
                 print("Waiting for operation to complete...")
 
-                response = (await operation).result()
+                response = await operation.result()
 
                 # Handle the response
                 print(response)

tests/integration/goldens/asset/noxfile.py

@@ -94,8 +94,10 @@
 @nox.session(python=ALL_PYTHON)
 def mypy(session):
     """Run the type checker."""
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2579):
+    # use the latest version of mypy
     session.install(
-        "mypy",
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )
@@ -244,27 +246,16 @@ def install_unittest_dependencies(session, *constraints):
 @nox.session(python=ALL_PYTHON)
 @nox.parametrize(
     "protobuf_implementation",
-    ["python", "upb", "cpp"],
+    ["python", "upb"],
 )
 def unit(session, protobuf_implementation):
     # Install all test dependencies, then install this package in-place.
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove this check once support for Protobuf 3.x is dropped.
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13", "3.14"):
-        session.skip("cpp implementation is not supported in python 3.11+")
-
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
     install_unittest_dependencies(session, "-c", constraints_path)
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
-    # The 'cpp' implementation requires Protobuf<4.
-    if protobuf_implementation == "cpp":
-        session.install("protobuf<4")
-
     # Run py.test against the unit tests.
     session.run(
         "py.test",
@@ -453,7 +444,7 @@ def docfx(session):
 @nox.session(python=PREVIEW_PYTHON_VERSION)
 @nox.parametrize(
     "protobuf_implementation",
-    ["python", "upb", "cpp"],
+    ["python", "upb"],
 )
 def prerelease_deps(session, protobuf_implementation):
     """
@@ -463,11 +454,6 @@ def prerelease_deps(session, protobuf_implementation):
     `pip install --pre <package>`.
     """
 
-    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
-    # Remove this check once support for Protobuf 3.x is dropped.
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13", "3.14"):
-        session.skip("cpp implementation is not supported in python 3.11+")
-
     # Install all dependencies
     session.install("-e", ".")
 

tests/integration/goldens/asset/samples/generated_samples/cloudasset_v1_generated_asset_service_analyze_iam_policy_longrunning_async.py

@@ -51,11 +51,11 @@ async def sample_analyze_iam_policy_longrunning():
     )
 
     # Make the request
-    operation = client.analyze_iam_policy_longrunning(request=request)
+    operation = await client.analyze_iam_policy_longrunning(request=request)
 
     print("Waiting for operation to complete...")
 
-    response = (await operation).result()
+    response = await operation.result()
 
     # Handle the response
     print(response)

tests/integration/goldens/asset/samples/generated_samples/cloudasset_v1_generated_asset_service_export_assets_async.py

@@ -48,11 +48,11 @@ async def sample_export_assets():
     )
 
     # Make the request
-    operation = client.export_assets(request=request)
+    operation = await client.export_assets(request=request)
 
     print("Waiting for operation to complete...")
 
-    response = (await operation).result()
+    response = await operation.result()
 
     # Handle the response
     print(response)