Merge branch 'main' into renovate/pypi-urllib3-vulnerability

Author: parthea

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+## [1.26.1](https://github.com/googleapis/gapic-generator-python/compare/v1.26.0...v1.26.1) (2025-08-28)
+
+
+### Bug Fixes
+
+* Temporarily disable `test_<service>_api_version_header_async` which is not marked as async ([9382ac3](https://github.com/googleapis/gapic-generator-python/commit/9382ac3546f335116665e10c4132369bc7637a67))
+
 ## [1.26.0](https://github.com/googleapis/gapic-generator-python/compare/v1.25.0...v1.26.0) (2025-05-28)
 
 

gapic/templates/_pypi_packages.j2

@@ -16,6 +16,6 @@ Note: Set the minimum version for google-cloud-documentai to 2.0.0 which has sup
     ("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.0.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": "0.1.6", "upper_bound": "1.0.0"}
+    ("google", "shopping", "type"): {"package_name": "google-shopping-type", "lower_bound": "1.0.0", "upper_bound": "2.0.0"}
 }
 %}

gapic/templates/noxfile.py.j2

@@ -81,7 +81,8 @@ nox.options.error_on_missing_interpreters = True
 def mypy(session):
     """Run the type checker."""
     session.install(
-        "mypy",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2

@@ -224,7 +224,11 @@ def test__get_api_endpoint():
 
 {% if service.version %}
 {% for method in service.methods.values() %}{% with method_name = method.name|snake_case %}
-{% for mode in ["", "async"] %}
+{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2428): Restore async test `
+ # once it properly runs as an async test with `@pytest.mark.asyncio`
+ # Add "async" to the list below `for mode in ["", "async"]`
+#}
+{% for mode in [""] %}
 {% if mode == "async" %}
 async def test_{{ method_name }}_api_version_header_async(transport_name="grpc"):
     client = {{ service.async_client_name }}(credentials=async_anonymous_credentials(), transport=transport_name)

noxfile.py

@@ -392,9 +392,9 @@ def showcase(
     """Run the Showcase test suite."""
 
     with showcase_library(session, templates=templates, other_opts=other_opts):
-        # Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
+        # Use pytest-asyncio<1.0.0 while we investigate the recent failure described in
         # https://github.com/googleapis/gapic-generator-python/issues/2399
-        session.install("pytest", "pytest-asyncio!=1.0.0")
+        session.install("pytest", "pytest-asyncio<1.0.0")
         test_directory = Path("tests", "system")
         ignore_file = env.get("IGNORE_FILE")
         pytest_command = [
@@ -424,9 +424,9 @@ def showcase_w_rest_async(
     with showcase_library(
         session, templates=templates, other_opts=other_opts, rest_async_io_enabled=True
     ):
-        # Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
+        # Use pytest-asyncio<1.0.0 while we investigate the recent failure described in
         # https://github.com/googleapis/gapic-generator-python/issues/2399
-        session.install("pytest", "pytest-asyncio!=1.0.0")
+        session.install("pytest", "pytest-asyncio<1.0.0")
         test_directory = Path("tests", "system")
         ignore_file = env.get("IGNORE_FILE")
         pytest_command = [
@@ -589,7 +589,8 @@ def showcase_mypy(
     """Perform typecheck analysis on the generated Showcase library."""
 
     session.install(
-        "mypy",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
+        "mypy<1.16.0",
         "types-setuptools",
         "types-protobuf",
         "types-requests",

requirements.txt

@@ -740,16 +740,16 @@ proto-plus==1.26.1 \
     # via
     #   -r requirements.in
     #   google-api-core
-protobuf==6.31.0 \
-    --hash=sha256:00a873c06efdfb854145d9ded730b09cf57d206075c38132674093370e2edabb \
-    --hash=sha256:10bd62802dfa0588649740a59354090eaf54b8322f772fbdcca19bc78d27f0d6 \
-    --hash=sha256:2c812f0f96ceb6b514448cefeb1df54ec06dde456783f5099c0e2f8a0f2caa89 \
-    --hash=sha256:314fab1a6a316469dc2dd46f993cbbe95c861ea6807da910becfe7475bc26ffe \
-    --hash=sha256:3e987c99fd634be8347246a02123250f394ba20573c953de133dc8b2c107dd71 \
-    --hash=sha256:5353e38844168a327acd2b2aa440044411cd8d1b6774d5701008bd1dba067c79 \
-    --hash=sha256:67ce50195e4e584275623b8e6bc6d3d3dfd93924bf6116b86b3b8975ab9e4571 \
-    --hash=sha256:6ac2e82556e822c17a8d23aa1190bbc1d06efb9c261981da95c71c9da09e9e23 \
-    --hash=sha256:96d8da25c83b11db5fe9e0376351ce25e7205e13224d939e097b6f82a72af824
+protobuf==6.31.1 \
+    --hash=sha256:0414e3aa5a5f3ff423828e1e6a6e907d6c65c1d5b7e6e975793d5590bdeecc16 \
+    --hash=sha256:426f59d2964864a1a366254fa703b8632dcec0790d8862d30034d8245e1cd447 \
+    --hash=sha256:4ee898bf66f7a8b0bd21bce523814e6fbd8c6add948045ce958b73af7e8878c6 \
+    --hash=sha256:6f1227473dc43d44ed644425268eb7c2e488ae245d51c6866d19fe158e207402 \
+    --hash=sha256:720a6c7e6b77288b85063569baae8536671b39f15cc22037ec7045658d80489e \
+    --hash=sha256:7fa17d5a29c2e04b7d90e5e32388b8bfd0e7107cd8e616feef7ed3fa6bdab5c9 \
+    --hash=sha256:8764cf4587791e7564051b35524b72844f845ad0bb011704c3736cce762d8fe9 \
+    --hash=sha256:a40fc12b84c154884d7d4c4ebd675d5b3b5283e155f324049ae396b95ddebc39 \
+    --hash=sha256:d8cac4c982f0b957a4dc73a80e2ea24fab08e679c0de9deb835f4a12d69aca9a
     # via
     #   -r requirements.in
     #   google-api-core

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.26.0"
+version = "1.26.1"
 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/noxfile.py

@@ -88,7 +88,8 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        "mypy",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )

tests/integration/goldens/credentials/noxfile.py

@@ -88,7 +88,8 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        "mypy",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )

tests/integration/goldens/eventarc/noxfile.py

@@ -88,7 +88,8 @@
 def mypy(session):
     """Run the type checker."""
     session.install(
-        "mypy",
+        # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
+        "mypy<1.16.0",
         "types-requests",
         "types-protobuf",
     )