Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 5cf9c1f

Browse files
partheaparthea
authored
Merge branch 'main' into api_audience
2 parents 2a84c22 + 98137d0 commit 5cf9c1f

18 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎gapic/ads-templates/setup.py.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
"googleapis-common-protos >= 1.53.0",
3535
"grpcio >= 1.10.0",
3636
"proto-plus >= 1.22.3, <2.0.0",
37-
"protobuf >= 4.25.8, <7.0.0",
37+
"protobuf >= 4.25.8, < 8.0.0",
3838
{% if api.requires_package(('google', 'iam', 'v1')) %}
3939
"grpc-google-iam-v1",
4040
{% endif %}

‎gapic/templates/noxfile.py.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ def core_deps_from_source(session, protobuf_implementation):
613613
core_dependencies_from_source = [
614614
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
615615
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
616-
"google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
616+
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
617617
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
618618
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
619619
]

‎gapic/templates/setup.py.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies = [
4242
"proto-plus >= 1.22.3, <2.0.0",
4343
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
4444
{# Explicitly exclude protobuf versions mentioned in https://cloud.google.com/support/bulletins#GCP-2022-019 #}
45-
"protobuf >= 4.25.8, <7.0.0",
45+
"protobuf >= 4.25.8, < 8.0.0",
4646
{% for package_tuple, package_info in pypi_packages.items() %}
4747
{# 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. #}
4848
{% if api.naming.warehouse_package_name != package_info.package_name %}

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# https://jinja.palletsprojects.com/en/3.0.x/templates/#jinja-filters.map
3636
# https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-0
3737
"jinja2 >= 2.11",
38-
"protobuf >= 4.25.8, <7.0.0",
38+
"protobuf >= 4.25.8, < 8.0.0",
3939
"pypandoc >= 1.4",
4040
"PyYAML >= 5.1.1",
4141
"grpc-google-iam-v1 >= 0.14.0, < 1.0.0",

‎tests/integration/goldens/asset/noxfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ def core_deps_from_source(session, protobuf_implementation):
605605
core_dependencies_from_source = [
606606
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
607607
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
608-
"google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
608+
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
609609
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
610610
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
611611
]

‎tests/integration/goldens/asset/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
4848
"proto-plus >= 1.22.3, <2.0.0",
4949
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
50-
"protobuf >= 4.25.8, <7.0.0",
50+
"protobuf >= 4.25.8, < 8.0.0",
5151
"google-cloud-access-context-manager >= 0.1.2, <1.0.0",
5252
"google-cloud-os-config >= 1.0.0, <2.0.0",
5353
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",

‎tests/integration/goldens/credentials/noxfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ def core_deps_from_source(session, protobuf_implementation):
605605
core_dependencies_from_source = [
606606
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
607607
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
608-
"google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
608+
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
609609
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
610610
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
611611
]

‎tests/integration/goldens/credentials/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
4848
"proto-plus >= 1.22.3, <2.0.0",
4949
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
50-
"protobuf >= 4.25.8, <7.0.0",
50+
"protobuf >= 4.25.8, < 8.0.0",
5151
]
5252
extras = {
5353
}

‎tests/integration/goldens/eventarc/noxfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ def core_deps_from_source(session, protobuf_implementation):
605605
core_dependencies_from_source = [
606606
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
607607
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
608-
"google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
608+
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
609609
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
610610
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
611611
]

‎tests/integration/goldens/eventarc/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
4848
"proto-plus >= 1.22.3, <2.0.0",
4949
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
50-
"protobuf >= 4.25.8, <7.0.0",
50+
"protobuf >= 4.25.8, < 8.0.0",
5151
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
5252
]
5353
extras = {

0 commit comments

Comments
 (0)