Skip to content

Commit 3362176

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Allow Protobuf 5.x (#12867)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 649277844 Source-Link: googleapis/googleapis@fd7efa2 Source-Link: googleapis/googleapis-gen@50be251 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1iYWNrdXAvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1jb25uZWN0LWdhdGV3YXkvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1odWIvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1tdWx0aWNsb3VkLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdzdWl0ZWFkZG9ucy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhbS1sb2dnaW5nLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhbS8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlhcC8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWlkcy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy1pbnZlbnRvcnkvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWttcy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxhbmd1YWdlLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWxpZmUtc2NpZW5jZXMvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1hbmFnZWQtaWRlbnRpdGllcy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1hbmFnZWRrYWZrYS8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lZGlhLXRyYW5zbGF0aW9uLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1lbWNhY2hlLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1pZ3JhdGlvbmNlbnRlci8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1vbml0b3JpbmctZGFzaGJvYXJkcy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1vbml0b3JpbmctbWV0cmljcy1zY29wZXMvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 0e39c1a commit 3362176

262 files changed

Lines changed: 1787 additions & 2375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/google-cloud-gke-backup/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Python Client for Backup for GKE
1515
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-gke-backup.svg
1616
:target: https://pypi.org/project/google-cloud-gke-backup/
1717
.. _Backup for GKE: https://cloud.google.com/kubernetes-engine/docs/add-on/backup-for-gke/concepts/backup-for-gke
18-
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/gkebackup/latest
18+
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/gkebackup/latest/summary_overview
1919
.. _Product Documentation: https://cloud.google.com/kubernetes-engine/docs/add-on/backup-for-gke/concepts/backup-for-gke
2020

2121
Quick Start

‎packages/google-cloud-gke-backup/docs/index.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ For a list of all ``google-cloud-gke-backup`` releases:
2121
:maxdepth: 2
2222

2323
CHANGELOG
24+
25+
.. toctree::
26+
:hidden:
27+
28+
summary_overview.md

‎packages/google-cloud-gke-backup/docs/summary_overview.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
This is a templated file. Adding content to this file may result in it being
3+
reverted. Instead, if you want to place additional content, create an
4+
"overview_content.md" file in `docs/` directory. The Sphinx tool will
5+
pick up on the content and merge the content.
6+
]: #
7+
8+
# Backup for GKE API
9+
10+
Overview of the APIs available for Backup for GKE API.
11+
12+
## All entries
13+
14+
Classes, methods and properties & attributes for
15+
Backup for GKE API.
16+
17+
[classes](https://cloud.google.com/python/docs/reference/gkebackup/latest/summary_class.html)
18+
19+
[methods](https://cloud.google.com/python/docs/reference/gkebackup/latest/summary_method.html)
20+
21+
[properties and
22+
attributes](https://cloud.google.com/python/docs/reference/gkebackup/latest/summary_property.html)

‎packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ def __init__(
9292

9393
# Save the scopes.
9494
self._scopes = scopes
95+
if not hasattr(self, "_ignore_credentials"):
96+
self._ignore_credentials: bool = False
9597

9698
# If no credentials are provided, then determine the appropriate
9799
# defaults.
@@ -104,7 +106,7 @@ def __init__(
104106
credentials, _ = google.auth.load_credentials_from_file(
105107
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
106108
)
107-
elif credentials is None:
109+
elif credentials is None and not self._ignore_credentials:
108110
credentials, _ = google.auth.default(
109111
**scopes_kwargs, quota_project_id=quota_project_id
110112
)

‎packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ def __init__(
135135

136136
if isinstance(channel, grpc.Channel):
137137
# Ignore credentials if a channel was passed.
138-
credentials = False
138+
credentials = None
139+
self._ignore_credentials = True
139140
# If a channel was explicitly provided, set it.
140141
self._grpc_channel = channel
141142
self._ssl_channel_credentials = None

‎packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ def __init__(
182182

183183
if isinstance(channel, aio.Channel):
184184
# Ignore credentials if a channel was passed.
185-
credentials = False
185+
credentials = None
186+
self._ignore_credentials = True
186187
# If a channel was explicitly provided, set it.
187188
self._grpc_channel = channel
188189
self._ssl_channel_credentials = None

‎packages/google-cloud-gke-backup/noxfile.py‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,28 @@ def install_unittest_dependencies(session, *constraints):
160160
session.install("-e", ".", *constraints)
161161

162162

163-
def default(session):
163+
@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
164+
@nox.parametrize(
165+
"protobuf_implementation",
166+
["python", "upb", "cpp"],
167+
)
168+
def unit(session, protobuf_implementation):
164169
# Install all test dependencies, then install this package in-place.
165170

171+
if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
172+
session.skip("cpp implementation is not supported in python 3.11+")
173+
166174
constraints_path = str(
167175
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
168176
)
169177
install_unittest_dependencies(session, "-c", constraints_path)
170178

179+
# TODO(https://github.com/googleapis/synthtool/issues/1976):
180+
# Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
181+
# The 'cpp' implementation requires Protobuf<4.
182+
if protobuf_implementation == "cpp":
183+
session.install("protobuf<4")
184+
171185
# Run py.test against the unit tests.
172186
session.run(
173187
"py.test",
@@ -181,15 +195,12 @@ def default(session):
181195
"--cov-fail-under=0",
182196
os.path.join("tests", "unit"),
183197
*session.posargs,
198+
env={
199+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
200+
},
184201
)
185202

186203

187-
@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
188-
def unit(session):
189-
"""Run the unit test suite."""
190-
default(session)
191-
192-
193204
def install_systemtest_dependencies(session, *constraints):
194205
# Use pre-release gRPC for system tests.
195206
# Exclude version 1.52.0rc1 which has a known issue.
@@ -358,9 +369,16 @@ def docfx(session):
358369

359370

360371
@nox.session(python="3.12")
361-
def prerelease_deps(session):
372+
@nox.parametrize(
373+
"protobuf_implementation",
374+
["python", "upb", "cpp"],
375+
)
376+
def prerelease_deps(session, protobuf_implementation):
362377
"""Run all tests with prerelease versions of dependencies installed."""
363378

379+
if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
380+
session.skip("cpp implementation is not supported in python 3.11+")
381+
364382
# Install all dependencies
365383
session.install("-e", ".[all, tests, tracing]")
366384
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
@@ -397,9 +415,9 @@ def prerelease_deps(session):
397415
"protobuf",
398416
# dependency of grpc
399417
"six",
418+
"grpc-google-iam-v1",
400419
"googleapis-common-protos",
401-
# Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
402-
"grpcio!=1.52.0rc1",
420+
"grpcio",
403421
"grpcio-status",
404422
"google-api-core",
405423
"google-auth",
@@ -425,4 +443,10 @@ def prerelease_deps(session):
425443
session.run("python", "-c", "import grpc; print(grpc.__version__)")
426444
session.run("python", "-c", "import google.auth; print(google.auth.__version__)")
427445

428-
session.run("py.test", "tests/unit")
446+
session.run(
447+
"py.test",
448+
"tests/unit",
449+
env={
450+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
451+
},
452+
)

‎packages/google-cloud-gke-backup/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
# See https://github.com/googleapis/google-cloud-python/issues/12364
4545
"google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
4646
"proto-plus >= 1.22.3, <2.0.0dev",
47-
"protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
47+
"protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
4848
"grpc-google-iam-v1 >= 0.12.4, <1.0.0dev",
4949
]
5050
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-backup"

‎packages/google-cloud-gke-backup/testing/constraints-3.7.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
google-api-core==1.34.1
88
google-auth==2.14.1
99
proto-plus==1.22.3
10-
protobuf==3.19.5
10+
protobuf==3.20.2
1111
grpc-google-iam-v1==0.12.4

0 commit comments

Comments
 (0)