From a3f58eba3781e550c838539b6cc88e02c0aebf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Fr=C3=A8rebeau?= <77391972+rfrerebe-stx@users.noreply.github.com> Date: Wed, 4 Mar 2026 12:36:14 +0000 Subject: [PATCH] chore: require protobuf > 8.0.0 --- gapic/ads-templates/setup.py.j2 | 2 +- gapic/templates/setup.py.j2 | 2 +- setup.py | 2 +- tests/integration/goldens/asset/setup.py | 2 +- tests/integration/goldens/credentials/setup.py | 2 +- tests/integration/goldens/eventarc/setup.py | 2 +- tests/integration/goldens/logging/setup.py | 2 +- tests/integration/goldens/logging_internal/setup.py | 2 +- tests/integration/goldens/redis/setup.py | 2 +- tests/integration/goldens/redis_selective/setup.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gapic/ads-templates/setup.py.j2 b/gapic/ads-templates/setup.py.j2 index 79d2e0b3fa..0d40bbb55c 100644 --- a/gapic/ads-templates/setup.py.j2 +++ b/gapic/ads-templates/setup.py.j2 @@ -34,7 +34,7 @@ dependencies = [ "googleapis-common-protos >= 1.53.0", "grpcio >= 1.10.0", "proto-plus >= 1.22.3, <2.0.0", - "protobuf >= 4.25.8, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", {% if api.requires_package(('google', 'iam', 'v1')) %} "grpc-google-iam-v1", {% endif %} diff --git a/gapic/templates/setup.py.j2 b/gapic/templates/setup.py.j2 index bff08c5006..831f5d0f31 100644 --- a/gapic/templates/setup.py.j2 +++ b/gapic/templates/setup.py.j2 @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 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 %} diff --git a/setup.py b/setup.py index 30ae36f148..d8c1a94288 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ # 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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", "pypandoc >= 1.4", "PyYAML >= 5.1.1", "grpc-google-iam-v1 >= 0.14.0, < 1.0.0", diff --git a/tests/integration/goldens/asset/setup.py b/tests/integration/goldens/asset/setup.py index c8118e1a4a..be5ff602c9 100755 --- a/tests/integration/goldens/asset/setup.py +++ b/tests/integration/goldens/asset/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", "google-cloud-access-context-manager >= 0.1.2, <1.0.0", "google-cloud-os-config >= 1.0.0, <2.0.0", "grpc-google-iam-v1 >= 0.14.0, <1.0.0", diff --git a/tests/integration/goldens/credentials/setup.py b/tests/integration/goldens/credentials/setup.py index 759cd11bc5..8da6aed1dd 100755 --- a/tests/integration/goldens/credentials/setup.py +++ b/tests/integration/goldens/credentials/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", ] extras = { } diff --git a/tests/integration/goldens/eventarc/setup.py b/tests/integration/goldens/eventarc/setup.py index eae607c5b2..cbb2177568 100755 --- a/tests/integration/goldens/eventarc/setup.py +++ b/tests/integration/goldens/eventarc/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", "grpc-google-iam-v1 >= 0.14.0, <1.0.0", ] extras = { diff --git a/tests/integration/goldens/logging/setup.py b/tests/integration/goldens/logging/setup.py index 2464aa281a..0b99458443 100755 --- a/tests/integration/goldens/logging/setup.py +++ b/tests/integration/goldens/logging/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", ] extras = { } diff --git a/tests/integration/goldens/logging_internal/setup.py b/tests/integration/goldens/logging_internal/setup.py index 2464aa281a..0b99458443 100755 --- a/tests/integration/goldens/logging_internal/setup.py +++ b/tests/integration/goldens/logging_internal/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", ] extras = { } diff --git a/tests/integration/goldens/redis/setup.py b/tests/integration/goldens/redis/setup.py index 878aac76e0..2cf3926c8e 100755 --- a/tests/integration/goldens/redis/setup.py +++ b/tests/integration/goldens/redis/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", ] extras = { "async_rest": [ diff --git a/tests/integration/goldens/redis_selective/setup.py b/tests/integration/goldens/redis_selective/setup.py index 878aac76e0..2cf3926c8e 100755 --- a/tests/integration/goldens/redis_selective/setup.py +++ b/tests/integration/goldens/redis_selective/setup.py @@ -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, <7.0.0", + "protobuf >= 4.25.8, < 8.0.0", ] extras = { "async_rest": [