Skip to content

[DRAFT] chore: use supported protobuf versions #2518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daniel-sanche wants to merge 4 commits into from
Closed

[DRAFT] chore: use supported protobuf versions #2518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0285f54
updated protobuf dependency
daniel-sanche Jan 7, 2026
312769f
updated goldens
daniel-sanche Jan 8, 2026
b5dd713
add upper ranges
daniel-sanche Jan 8, 2026
1e4cd83
Merge branch 'main' into update_protobuf
daniel-sanche Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion gapic/templates/setup.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ 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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
{% 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 %}
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/asset/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
"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",
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/credentials/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
]
extras = {
}
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/eventarc/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
]
extras = {
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/logging/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
]
extras = {
}
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/logging_internal/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
]
extras = {
}
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/redis/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
]
extras = {
"async_rest": [
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/goldens/redis_selective/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +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>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
"protobuf>=3.20.2; python_version == '3.7'",
"protobuf>=4.21.6; python_version == '3.8'",
"protobuf>=5.0.0; python_version == '3.9'",
"protobuf>=6.0.0,<7.0.0; python_version >= '3.10'",
]
extras = {
"async_rest": [
Expand Down
Loading