From a619b63a2807a2ea721afc46bc4493ff35f7d335 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 2 Jun 2026 18:40:06 +0000 Subject: [PATCH 1/4] fix: require Protobuf 6.33.5 --- packages/gapic-generator/gapic/ads-templates/setup.py.j2 | 4 ++-- .../%namespace/%name_%version/%sub/__init__.py.j2 | 8 ++++---- packages/gapic-generator/gapic/templates/setup.py.j2 | 5 ++--- .../templates/testing/constraints-3.10-async-rest.txt.j2 | 4 ++-- .../gapic/templates/testing/constraints-3.10.txt.j2 | 4 ++-- .../gapic/templates/testing/constraints-3.13.txt.j2 | 2 +- .../gapic/templates/testing/constraints-3.14.txt.j2 | 2 +- packages/gapic-generator/requirements.in | 2 +- packages/gapic-generator/setup.py | 8 ++++---- .../goldens/asset/google/cloud/asset_v1/__init__.py | 8 ++++---- .../tests/integration/goldens/asset/setup.py | 4 ++-- .../goldens/asset/testing/constraints-3.10.txt | 4 ++-- .../goldens/asset/testing/constraints-3.13.txt | 2 +- .../goldens/asset/testing/constraints-3.14.txt | 2 +- .../credentials/google/iam/credentials_v1/__init__.py | 8 ++++---- .../tests/integration/goldens/credentials/setup.py | 4 ++-- .../goldens/credentials/testing/constraints-3.10.txt | 4 ++-- .../goldens/credentials/testing/constraints-3.13.txt | 2 +- .../goldens/credentials/testing/constraints-3.14.txt | 2 +- .../goldens/eventarc/google/cloud/eventarc_v1/__init__.py | 8 ++++---- .../tests/integration/goldens/eventarc/setup.py | 4 ++-- .../goldens/eventarc/testing/constraints-3.10.txt | 4 ++-- .../goldens/eventarc/testing/constraints-3.13.txt | 2 +- .../goldens/eventarc/testing/constraints-3.14.txt | 2 +- .../goldens/logging/google/cloud/logging_v2/__init__.py | 8 ++++---- .../tests/integration/goldens/logging/setup.py | 4 ++-- .../goldens/logging/testing/constraints-3.10.txt | 4 ++-- .../goldens/logging/testing/constraints-3.13.txt | 2 +- .../goldens/logging/testing/constraints-3.14.txt | 2 +- .../logging_internal/google/cloud/logging_v2/__init__.py | 8 ++++---- .../tests/integration/goldens/logging_internal/setup.py | 4 ++-- .../goldens/logging_internal/testing/constraints-3.10.txt | 4 ++-- .../goldens/logging_internal/testing/constraints-3.13.txt | 2 +- .../goldens/logging_internal/testing/constraints-3.14.txt | 2 +- .../goldens/redis/google/cloud/redis_v1/__init__.py | 8 ++++---- .../tests/integration/goldens/redis/setup.py | 5 ++--- .../goldens/redis/testing/constraints-3.10-async-rest.txt | 4 ++-- .../goldens/redis/testing/constraints-3.10.txt | 4 ++-- .../goldens/redis/testing/constraints-3.13.txt | 2 +- .../goldens/redis/testing/constraints-3.14.txt | 2 +- .../redis_selective/google/cloud/redis_v1/__init__.py | 8 ++++---- .../tests/integration/goldens/redis_selective/setup.py | 5 ++--- .../testing/constraints-3.10-async-rest.txt | 4 ++-- .../goldens/redis_selective/testing/constraints-3.10.txt | 4 ++-- .../goldens/redis_selective/testing/constraints-3.13.txt | 2 +- .../goldens/redis_selective/testing/constraints-3.14.txt | 2 +- .../google/cloud/storagebatchoperations_v1/__init__.py | 8 ++++---- .../integration/goldens/storagebatchoperations/setup.py | 4 ++-- .../storagebatchoperations/testing/constraints-3.10.txt | 4 ++-- .../storagebatchoperations/testing/constraints-3.13.txt | 2 +- .../storagebatchoperations/testing/constraints-3.14.txt | 2 +- 51 files changed, 103 insertions(+), 106 deletions(-) diff --git a/packages/gapic-generator/gapic/ads-templates/setup.py.j2 b/packages/gapic-generator/gapic/ads-templates/setup.py.j2 index 1684c2de1a61..ae6ec4cbdad6 100644 --- a/packages/gapic-generator/gapic/ads-templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/ads-templates/setup.py.j2 @@ -29,12 +29,12 @@ else: release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.10.0, < 3.0.0", + "google-api-core[grpc] >= 2.24.2, < 3.0.0", "google-auth >= 2.14.1, <3.0.0", "googleapis-common-protos >= 1.53.0", "grpcio >= 1.10.0", "proto-plus >= 1.22.3, <2.0.0", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", {% if api.requires_package(('google', 'iam', 'v1')) %} "grpc-google-iam-v1", {% endif %} diff --git a/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 b/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 index c1e5c715cf71..497592654d20 100644 --- a/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 +++ b/packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2 @@ -69,7 +69,7 @@ else: # pragma: NO COVER def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -98,9 +98,9 @@ else: # pragma: NO COVER return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/gapic/templates/setup.py.j2 b/packages/gapic-generator/gapic/templates/setup.py.j2 index e1927bc48fe0..5e76528969a2 100644 --- a/packages/gapic-generator/gapic/templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/templates/setup.py.j2 @@ -33,7 +33,7 @@ else: release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -42,7 +42,7 @@ dependencies = [ "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", {# Explicitly exclude protobuf versions mentioned in https://cloud.google.com/support/bulletins#GCP-2022-019 #} - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} @@ -55,7 +55,6 @@ dependencies = [ extras = { {% if rest_async_io_enabled %} "async_rest": [ - "google-api-core[grpc] >= 2.21.0, < 3.0.0", "google-auth[aiohttp] >= 2.35.0, <3.0.0" ], {% endif %} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 index 9f0051916ec0..9ef89745583f 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 @@ -8,11 +8,11 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.21.0 +google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 index 63ad4c20f28b..6cefeeca94fd 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 @@ -5,11 +5,11 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.13.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.13.txt.j2 index c2e7b8a9934c..a2e0a3f4cb1e 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.13.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.13.txt.j2 @@ -10,7 +10,7 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.14.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.14.txt.j2 index c2e7b8a9934c..a2e0a3f4cb1e 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.14.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.14.txt.j2 @@ -10,7 +10,7 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} diff --git a/packages/gapic-generator/requirements.in b/packages/gapic-generator/requirements.in index 2a9d7bb2cdb7..2776bb919bb8 100644 --- a/packages/gapic-generator/requirements.in +++ b/packages/gapic-generator/requirements.in @@ -3,7 +3,7 @@ google-api-core googleapis-common-protos jinja2 MarkupSafe -protobuf>=4.25.8 +protobuf>=6.33.5 # for CVE-2026-0994. See https://github.com/advisories/GHSA-7gcm-g887-7qv7 and https://protobuf.dev/support/version-support/#python pypandoc PyYAML grpc-google-iam-v1 diff --git a/packages/gapic-generator/setup.py b/packages/gapic-generator/setup.py index 8ac2ba041d97..1872dcc57c56 100644 --- a/packages/gapic-generator/setup.py +++ b/packages/gapic-generator/setup.py @@ -28,14 +28,14 @@ # Ensure that the lower bounds of these dependencies match what we have in the # templated setup.py.j2: https://github.com/googleapis/gapic-generator-python/blob/main/gapic/templates/setup.py.j2 "click >= 6.7", - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", - "googleapis-common-protos >= 1.55.0", - "grpcio >= 1.24.3", + "google-api-core[grpc] >= 2.24.2, < 3.0.0", + "googleapis-common-protos >= 1.55.0, < 2.0.0", + "grpcio >= 1.24.3, < 2.0.0", # 2.11.0 is required which adds the `default` argument to `jinja-filters.map()` # https://jinja.palletsprojects.com/en/3.0.x/templates/#jinja-filters.map # https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-0 "jinja2 >= 2.11", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", "pypandoc >= 1.4", "PyYAML >= 5.1.1", "grpc-google-iam-v1 >= 0.14.0, < 1.0.0", diff --git a/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py index 4140bfbde694..f272a61b7a4e 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py @@ -129,7 +129,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -158,9 +158,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index 2a8d122f099c..01546ad1197f 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", "google-cloud-access-context-manager >= 0.2.0, <1.0.0", "google-cloud-os-config >= 1.13.0, <2.0.0", "grpc-google-iam-v1 >= 0.14.0, <1.0.0", diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt index 554a13c22f32..dfdd98e45e57 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt @@ -4,11 +4,11 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 google-cloud-access-context-manager==0.2.0 google-cloud-os-config==1.13.0 grpc-google-iam-v1==0.14.0 diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.13.txt index c3db09a0c746..f63842dab6f9 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.13.txt @@ -9,7 +9,7 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 google-cloud-access-context-manager>=0 google-cloud-os-config>=1 grpc-google-iam-v1>=0 diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.14.txt index c3db09a0c746..f63842dab6f9 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.14.txt @@ -9,7 +9,7 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 google-cloud-access-context-manager>=0 google-cloud-os-config>=1 grpc-google-iam-v1>=0 diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py index b8f62a77a42b..943687313e36 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py @@ -56,7 +56,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -85,9 +85,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py index cb2edb25790b..0728e5896834 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py index 9885f1e7b375..c2c65d30a333 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py @@ -118,7 +118,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -147,9 +147,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py index 58e6940bcf39..71a7b8af34a5 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", "grpc-google-iam-v1 >= 0.14.0, <1.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt index b39cd54634f9..2f47d945676a 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt @@ -4,9 +4,9 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 grpc-google-iam-v1==0.14.0 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.13.txt index 2ae5a677e852..f85022a2fb62 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.13.txt @@ -9,5 +9,5 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 grpc-google-iam-v1>=0 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.14.txt index 2ae5a677e852..f85022a2fb62 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.14.txt @@ -9,5 +9,5 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 grpc-google-iam-v1>=0 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py b/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py index 52cae052fcfa..8b559fb0b227 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py @@ -128,7 +128,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -157,9 +157,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/logging/setup.py b/packages/gapic-generator/tests/integration/goldens/logging/setup.py index 0b9176488ae6..02b844ee5595 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py index 33ba01d9940d..0469de869617 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py @@ -128,7 +128,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -157,9 +157,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py index 0b9176488ae6..02b844ee5595 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py index 0cd59a0dc55f..c2897c61e9d7 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py @@ -75,7 +75,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -104,9 +104,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/redis/setup.py b/packages/gapic-generator/tests/integration/goldens/redis/setup.py index 358f0f73ee87..869a3db4da2a 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,11 +47,10 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { "async_rest": [ - "google-api-core[grpc] >= 2.21.0, < 3.0.0", "google-auth[aiohttp] >= 2.35.0, <3.0.0" ], } diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt index 4148e63e7dd1..c2968ab02f23 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt @@ -5,8 +5,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.21.0 +google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py index f9ca3ee685f8..043562140c7d 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py @@ -68,7 +68,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -97,9 +97,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py index 358f0f73ee87..869a3db4da2a 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,11 +47,10 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { "async_rest": [ - "google-api-core[grpc] >= 2.21.0, < 3.0.0", "google-auth[aiohttp] >= 2.35.0, <3.0.0" ], } diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt index 4148e63e7dd1..c2968ab02f23 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt @@ -5,8 +5,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.21.0 +google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py index 6e2831b029b7..c1ad7c247ae0 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/__init__.py @@ -76,7 +76,7 @@ def parse_version_to_tuple(version_string: str): """Safely converts a semantic version string to a comparable tuple of integers. - Example: "4.25.8" -> (4, 25, 8) + Example: "6.33.5" -> (6, 33, 5) Ignores non-numeric parts and handles common version formats. Args: version_string: Version string in the format "x.y.z" or "x.y.z" @@ -105,9 +105,9 @@ def _get_version(dependency_name): return (None, "--") _dependency_package = "google.protobuf" - _next_supported_version = "4.25.8" - _next_supported_version_tuple = (4, 25, 8) - _recommendation = " (we recommend 6.x)" + _next_supported_version = "6.33.5" + _next_supported_version_tuple = (6, 33, 5) + _recommendation = " (we recommend 7.x)" (_version_used, _version_used_string) = _get_version(_dependency_package) if _version_used and _version_used < _next_supported_version_tuple: warnings.warn(f"Package {_package_label} depends on " + diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py index 34dbb3ed7860..d8fb44682c74 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py @@ -39,7 +39,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 2.17.1, <3.0.0", + "google-api-core[grpc] >= 2.24.2, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf >= 4.25.8, < 8.0.0", + "protobuf >= 6.33.5, < 8.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt index 7be9c36933fc..42b374f67766 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt @@ -4,8 +4,8 @@ # pinning their versions to their lower bounds. # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", # then this file should have google-cloud-foo==1.14.0 -google-api-core==2.17.1 +google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.22.3 -protobuf==4.25.8 +protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.13.txt b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.13.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.13.txt +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.13.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.14.txt b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.14.txt index 1e93c60e50aa..6bd7e1f5b03d 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.14.txt +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.14.txt @@ -9,4 +9,4 @@ google-api-core>=2 google-auth>=2 grpcio>=1 proto-plus>=1 -protobuf>=6 +protobuf>=7 From a7857b29a1895829f10393f200117528cf7d6b98 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 2 Jun 2026 18:46:50 +0000 Subject: [PATCH 2/4] bump proto-plus --- packages/gapic-generator/WORKSPACE | 5 +++++ packages/gapic-generator/gapic/ads-templates/setup.py.j2 | 2 +- packages/gapic-generator/gapic/templates/setup.py.j2 | 3 +-- .../templates/testing/constraints-3.10-async-rest.txt.j2 | 2 +- .../gapic/templates/testing/constraints-3.10.txt.j2 | 2 +- .../gapic-generator/tests/integration/goldens/asset/setup.py | 3 +-- .../integration/goldens/asset/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/credentials/setup.py | 3 +-- .../goldens/credentials/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/eventarc/setup.py | 3 +-- .../goldens/eventarc/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/logging/setup.py | 3 +-- .../integration/goldens/logging/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/logging_internal/setup.py | 3 +-- .../goldens/logging_internal/testing/constraints-3.10.txt | 2 +- .../gapic-generator/tests/integration/goldens/redis/setup.py | 3 +-- .../goldens/redis/testing/constraints-3.10-async-rest.txt | 2 +- .../integration/goldens/redis/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/redis_selective/setup.py | 3 +-- .../redis_selective/testing/constraints-3.10-async-rest.txt | 2 +- .../goldens/redis_selective/testing/constraints-3.10.txt | 2 +- .../integration/goldens/storagebatchoperations/setup.py | 3 +-- .../storagebatchoperations/testing/constraints-3.10.txt | 2 +- 23 files changed, 27 insertions(+), 31 deletions(-) diff --git a/packages/gapic-generator/WORKSPACE b/packages/gapic-generator/WORKSPACE index 4da1de3cc7d4..2665ddcbc629 100644 --- a/packages/gapic-generator/WORKSPACE +++ b/packages/gapic-generator/WORKSPACE @@ -123,3 +123,8 @@ switched_rules_by_language( gapic = True, grpc = True, ) +load("@rules_python//python:repositories.bzl", "python_register_toolchains") +python_register_toolchains( + name = "python311", + python_version = "3.11", +) diff --git a/packages/gapic-generator/gapic/ads-templates/setup.py.j2 b/packages/gapic-generator/gapic/ads-templates/setup.py.j2 index ae6ec4cbdad6..da9c3b995396 100644 --- a/packages/gapic-generator/gapic/ads-templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/ads-templates/setup.py.j2 @@ -33,7 +33,7 @@ dependencies = [ "google-auth >= 2.14.1, <3.0.0", "googleapis-common-protos >= 1.53.0", "grpcio >= 1.10.0", - "proto-plus >= 1.22.3, <2.0.0", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", {% if api.requires_package(('google', 'iam', 'v1')) %} "grpc-google-iam-v1", diff --git a/packages/gapic-generator/gapic/templates/setup.py.j2 b/packages/gapic-generator/gapic/templates/setup.py.j2 index 5e76528969a2..9834a2884c95 100644 --- a/packages/gapic-generator/gapic/templates/setup.py.j2 +++ b/packages/gapic-generator/gapic/templates/setup.py.j2 @@ -39,8 +39,7 @@ dependencies = [ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", {# Explicitly exclude protobuf versions mentioned in https://cloud.google.com/support/bulletins#GCP-2022-019 #} "protobuf >= 6.33.5, < 8.0.0", {% for package_tuple, package_info in pypi_packages.items() %} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 index 9ef89745583f..a8c43d63aa40 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2 @@ -11,7 +11,7 @@ google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} diff --git a/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 b/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 index 6cefeeca94fd..4d6f7eea3308 100644 --- a/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 +++ b/packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2 @@ -8,7 +8,7 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index 01546ad1197f..71efdeca3452 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", "google-cloud-access-context-manager >= 0.2.0, <1.0.0", "google-cloud-os-config >= 1.13.0, <2.0.0", diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt index dfdd98e45e57..cb0356a1834f 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt @@ -7,7 +7,7 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 google-cloud-access-context-manager==0.2.0 google-cloud-os-config==1.13.0 diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py index 0728e5896834..4d4533c20e18 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/credentials/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py index 71a7b8af34a5..c2298271b6e9 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", "grpc-google-iam-v1 >= 0.14.0, <1.0.0", ] diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt index 2f47d945676a..0eb441c68ce5 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt @@ -7,6 +7,6 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 grpc-google-iam-v1==0.14.0 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/setup.py b/packages/gapic-generator/tests/integration/goldens/logging/setup.py index 02b844ee5595..38c15878df5e 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py index 02b844ee5595..38c15878df5e 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/setup.py b/packages/gapic-generator/tests/integration/goldens/redis/setup.py index 869a3db4da2a..18e5226c7306 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt index c2968ab02f23..2e5186f9ec6e 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10-async-rest.txt @@ -8,5 +8,5 @@ google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py index 869a3db4da2a..18e5226c7306 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt index c2968ab02f23..2e5186f9ec6e 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10-async-rest.txt @@ -8,5 +8,5 @@ google-api-core==2.24.2 google-auth==2.35.0 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py index d8fb44682c74..56c8e3127f42 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/setup.py @@ -45,8 +45,7 @@ "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.59.0, < 2.0.0", "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", - "proto-plus >= 1.22.3, <2.0.0", - "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", + "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt index 42b374f67766..81605a716d32 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/testing/constraints-3.10.txt @@ -7,5 +7,5 @@ google-api-core==2.24.2 google-auth==2.14.1 grpcio==1.59.0 -proto-plus==1.22.3 +proto-plus==1.26.1 protobuf==6.33.5 From f9cb3085c1926f61b4a344cf55702d6e55abc3b4 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 2 Jun 2026 18:54:54 +0000 Subject: [PATCH 3/4] bump grpc-google-iam-v1 --- packages/gapic-generator/WORKSPACE | 5 ----- packages/gapic-generator/gapic/templates/_pypi_packages.j2 | 2 +- packages/gapic-generator/setup.py | 2 +- .../gapic-generator/tests/integration/goldens/asset/setup.py | 2 +- .../integration/goldens/asset/testing/constraints-3.10.txt | 2 +- .../tests/integration/goldens/eventarc/setup.py | 2 +- .../goldens/eventarc/testing/constraints-3.10.txt | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/gapic-generator/WORKSPACE b/packages/gapic-generator/WORKSPACE index 2665ddcbc629..4da1de3cc7d4 100644 --- a/packages/gapic-generator/WORKSPACE +++ b/packages/gapic-generator/WORKSPACE @@ -123,8 +123,3 @@ switched_rules_by_language( gapic = True, grpc = True, ) -load("@rules_python//python:repositories.bzl", "python_register_toolchains") -python_register_toolchains( - name = "python311", - python_version = "3.11", -) diff --git a/packages/gapic-generator/gapic/templates/_pypi_packages.j2 b/packages/gapic-generator/gapic/templates/_pypi_packages.j2 index 1495e827fc49..bf09b910148f 100644 --- a/packages/gapic-generator/gapic/templates/_pypi_packages.j2 +++ b/packages/gapic-generator/gapic/templates/_pypi_packages.j2 @@ -13,7 +13,7 @@ allowed version. ("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", "v1"): {"package_name": "grpc-google-iam-v1", "lower_bound": "0.14.2", "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"} } diff --git a/packages/gapic-generator/setup.py b/packages/gapic-generator/setup.py index 1872dcc57c56..a1646a992684 100644 --- a/packages/gapic-generator/setup.py +++ b/packages/gapic-generator/setup.py @@ -38,7 +38,7 @@ "protobuf >= 6.33.5, < 8.0.0", "pypandoc >= 1.4", "PyYAML >= 5.1.1", - "grpc-google-iam-v1 >= 0.14.0, < 1.0.0", + "grpc-google-iam-v1 >= 0.14.2, < 1.0.0", "libcst >= 0.4.9, < 2.0.0", "inflection >= 0.5.1, < 1.0.0", ] diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index 71efdeca3452..32c3b3505155 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -49,7 +49,7 @@ "protobuf >= 6.33.5, < 8.0.0", "google-cloud-access-context-manager >= 0.2.0, <1.0.0", "google-cloud-os-config >= 1.13.0, <2.0.0", - "grpc-google-iam-v1 >= 0.14.0, <1.0.0", + "grpc-google-iam-v1 >= 0.14.2, <1.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt index cb0356a1834f..7c0b62244065 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt @@ -11,4 +11,4 @@ proto-plus==1.26.1 protobuf==6.33.5 google-cloud-access-context-manager==0.2.0 google-cloud-os-config==1.13.0 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.14.2 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py index c2298271b6e9..0a0aae863942 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/setup.py @@ -47,7 +47,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", - "grpc-google-iam-v1 >= 0.14.0, <1.0.0", + "grpc-google-iam-v1 >= 0.14.2, <1.0.0", ] extras = { } diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt index 0eb441c68ce5..3a84666fb90e 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/testing/constraints-3.10.txt @@ -9,4 +9,4 @@ google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.26.1 protobuf==6.33.5 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.14.2 From 843ebe88b7ce7e31fbdd542e591edbe6cabfaaea Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 2 Jun 2026 19:10:48 +0000 Subject: [PATCH 4/4] bump more packages --- .../gapic/templates/_pypi_packages.j2 | 14 +++++++------- .../tests/integration/goldens/asset/setup.py | 4 ++-- .../goldens/asset/testing/constraints-3.10.txt | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/gapic-generator/gapic/templates/_pypi_packages.j2 b/packages/gapic-generator/gapic/templates/_pypi_packages.j2 index bf09b910148f..db839ef607db 100644 --- a/packages/gapic-generator/gapic/templates/_pypi_packages.j2 +++ b/packages/gapic-generator/gapic/templates/_pypi_packages.j2 @@ -7,14 +7,14 @@ allowed version. --> {% 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.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", "apps", "script", "type"): {"package_name": "google-apps-script-type", "lower_bound": "0.3.14", "upper_bound": "1.0.0"}, + ("google", "geo", "type"): {"package_name": "google-geo-type", "lower_bound": "0.3.12", "upper_bound": "1.0.0"}, + ("google", "identity", "accesscontextmanager", "v1"): {"package_name": "google-cloud-access-context-manager", "lower_bound": "0.2.2", "upper_bound": "1.0.0"}, + ("google", "cloud", "documentai", "v1"): {"package_name": "google-cloud-documentai", "lower_bound": "3.2.1", "upper_bound": "4.0.0"}, + ("google", "cloud", "kms", "v1"): {"package_name": "google-cloud-kms", "lower_bound": "3.4.1", "upper_bound": "4.0.0"}, + ("google", "cloud", "osconfig", "v1"): {"package_name": "google-cloud-os-config", "lower_bound": "1.20.1", "upper_bound": "2.0.0"}, ("google", "iam", "v1"): {"package_name": "grpc-google-iam-v1", "lower_bound": "0.14.2", "upper_bound": "1.0.0"}, - ("google", "iam", "v2"): {"package_name": "google-cloud-iam", "lower_bound": "2.12.2", "upper_bound": "3.0.0"}, + ("google", "iam", "v2"): {"package_name": "google-cloud-iam", "lower_bound": "2.18.2", "upper_bound": "3.0.0"}, ("google", "shopping", "type"): {"package_name": "google-shopping-type", "lower_bound": "1.0.0", "upper_bound": "2.0.0"} } %} diff --git a/packages/gapic-generator/tests/integration/goldens/asset/setup.py b/packages/gapic-generator/tests/integration/goldens/asset/setup.py index 32c3b3505155..197a610bff72 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/setup.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/setup.py @@ -47,8 +47,8 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.26.1, <2.0.0", "protobuf >= 6.33.5, < 8.0.0", - "google-cloud-access-context-manager >= 0.2.0, <1.0.0", - "google-cloud-os-config >= 1.13.0, <2.0.0", + "google-cloud-access-context-manager >= 0.2.2, <1.0.0", + "google-cloud-os-config >= 1.20.1, <2.0.0", "grpc-google-iam-v1 >= 0.14.2, <1.0.0", ] extras = { diff --git a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt index 7c0b62244065..ec7b713eaf6f 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt +++ b/packages/gapic-generator/tests/integration/goldens/asset/testing/constraints-3.10.txt @@ -9,6 +9,6 @@ google-auth==2.14.1 grpcio==1.59.0 proto-plus==1.26.1 protobuf==6.33.5 -google-cloud-access-context-manager==0.2.0 -google-cloud-os-config==1.13.0 +google-cloud-access-context-manager==0.2.2 +google-cloud-os-config==1.20.1 grpc-google-iam-v1==0.14.2