Skip to content

Commit 9a629e1

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
feat: [Many APIs] Add support for Python 3.12 (#12068)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 586460538 Source-Link: googleapis/googleapis@44582d0 Source-Link: googleapis/googleapis-gen@5e7073c Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9zLWNvbmZpZy8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW9zLWxvZ2luLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXByaXZhdGUtY2EvLk93bEJvdC55YW1sIiwiaCI6IjVlNzA3M2M5ZGU4NDc5MjljNGFlOTdmOGE0NDRjM2ZjYTJkNDVhNmIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXByaXZhdGUtY2F0YWxvZy8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXB1YmxpYy1jYS8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlY2FwdGNoYS1lbnRlcnByaXNlLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlY29tbWVuZGVyLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlZGlzLWNsdXN0ZXIvLk93bEJvdC55YW1sIiwiaCI6IjVlNzA3M2M5ZGU4NDc5MjljNGFlOTdmOGE0NDRjM2ZjYTJkNDVhNmIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlZGlzLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlc291cmNlLXNldHRpbmdzLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJldGFpbC8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJ1bi8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNjaGVkdWxlci8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlY3VyaXR5Y2VudGVyLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNoZWxsLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNvdXJjZS1jb250ZXh0Ly5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNwZWVjaC8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXN0b3JhZ2VpbnNpZ2h0cy8uT3dsQm90LnlhbWwiLCJoIjoiNWU3MDczYzlkZTg0NzkyOWM0YWU5N2Y4YTQ0NGMzZmNhMmQ0NWE2YiJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXN1cHBvcnQvLk93bEJvdC55YW1sIiwiaCI6IjVlNzA3M2M5ZGU4NDc5MjljNGFlOTdmOGE0NDRjM2ZjYTJkNDVhNmIifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXRhc2tzLy5Pd2xCb3QueWFtbCIsImgiOiI1ZTcwNzNjOWRlODQ3OTI5YzRhZTk3ZjhhNDQ0YzNmY2EyZDQ1YTZiIn0= BEGIN_COMMIT_OVERRIDE feat: Add support for python 3.12 feat: Introduce compatibility with native namespace packages fix: Use `retry_async` instead of `retry` in async client fix: Require proto-plus >= 1.22.3 END_COMMIT_OVERRIDE --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent b96013d commit 9a629e1

76 files changed

Lines changed: 538 additions & 492 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-os-login/CONTRIBUTING.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In order to add a feature:
2222
documentation.
2323

2424
- The feature must work fully on the following CPython versions:
25-
3.7, 3.8, 3.9, 3.10 and 3.11 on both UNIX and Windows.
25+
3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.
2626

2727
- The feature must not add unnecessary dependencies (where
2828
"unnecessary" is of course subjective, but new dependencies should
@@ -72,7 +72,7 @@ We use `nox <https://nox.readthedocs.io/en/latest/>`__ to instrument our tests.
7272

7373
- To run a single unit test::
7474

75-
$ nox -s unit-3.11 -- -k <name of test>
75+
$ nox -s unit-3.12 -- -k <name of test>
7676

7777

7878
.. note::
@@ -143,12 +143,12 @@ Running System Tests
143143
$ nox -s system
144144

145145
# Run a single system test
146-
$ nox -s system-3.11 -- -k <name of test>
146+
$ nox -s system-3.12 -- -k <name of test>
147147

148148

149149
.. note::
150150

151-
System tests are only configured to run under Python 3.8, 3.9, 3.10 and 3.11.
151+
System tests are only configured to run under Python 3.8, 3.9, 3.10, 3.11 and 3.12.
152152
For expediency, we do not run them in older versions of Python 3.
153153

154154
This alone will not run the tests. You'll need to change some local
@@ -226,12 +226,14 @@ We support:
226226
- `Python 3.9`_
227227
- `Python 3.10`_
228228
- `Python 3.11`_
229+
- `Python 3.12`_
229230

230231
.. _Python 3.7: https://docs.python.org/3.7/
231232
.. _Python 3.8: https://docs.python.org/3.8/
232233
.. _Python 3.9: https://docs.python.org/3.9/
233234
.. _Python 3.10: https://docs.python.org/3.10/
234235
.. _Python 3.11: https://docs.python.org/3.11/
236+
.. _Python 3.12: https://docs.python.org/3.12/
235237

236238

237239
Supported versions can be found in our ``noxfile.py`` `config`_.

‎packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030

3131
from google.api_core import exceptions as core_exceptions
3232
from google.api_core import gapic_v1
33-
from google.api_core import retry as retries
33+
from google.api_core import retry_async as retries
3434
from google.api_core.client_options import ClientOptions
3535
from google.auth import credentials as ga_credentials # type: ignore
3636
from google.oauth2 import service_account # type: ignore
3737

3838
from google.cloud.oslogin_v1 import gapic_version as package_version
3939

4040
try:
41-
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
41+
OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault]
4242
except AttributeError: # pragma: NO COVER
43-
OptionalRetry = Union[retries.Retry, object] # type: ignore
43+
OptionalRetry = Union[retries.AsyncRetry, object] # type: ignore
4444

4545
from google.protobuf import field_mask_pb2 # type: ignore
4646

@@ -283,7 +283,7 @@ async def sample_create_ssh_public_key():
283283
This corresponds to the ``ssh_public_key`` field
284284
on the ``request`` instance; if ``request`` is provided, this
285285
should not be set.
286-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
286+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
287287
should be retried.
288288
timeout (float): The timeout for this request.
289289
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -386,7 +386,7 @@ async def sample_delete_posix_account():
386386
This corresponds to the ``name`` field
387387
on the ``request`` instance; if ``request`` is provided, this
388388
should not be set.
389-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
389+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
390390
should be retried.
391391
timeout (float): The timeout for this request.
392392
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -413,7 +413,7 @@ async def sample_delete_posix_account():
413413
# and friendly error handling.
414414
rpc = gapic_v1.method_async.wrap_method(
415415
self._client._transport.delete_posix_account,
416-
default_retry=retries.Retry(
416+
default_retry=retries.AsyncRetry(
417417
initial=0.1,
418418
maximum=60.0,
419419
multiplier=1.3,
@@ -488,7 +488,7 @@ async def sample_delete_ssh_public_key():
488488
This corresponds to the ``name`` field
489489
on the ``request`` instance; if ``request`` is provided, this
490490
should not be set.
491-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
491+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
492492
should be retried.
493493
timeout (float): The timeout for this request.
494494
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -515,7 +515,7 @@ async def sample_delete_ssh_public_key():
515515
# and friendly error handling.
516516
rpc = gapic_v1.method_async.wrap_method(
517517
self._client._transport.delete_ssh_public_key,
518-
default_retry=retries.Retry(
518+
default_retry=retries.AsyncRetry(
519519
initial=0.1,
520520
maximum=60.0,
521521
multiplier=1.3,
@@ -592,7 +592,7 @@ async def sample_get_login_profile():
592592
This corresponds to the ``name`` field
593593
on the ``request`` instance; if ``request`` is provided, this
594594
should not be set.
595-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
595+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
596596
should be retried.
597597
timeout (float): The timeout for this request.
598598
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -626,7 +626,7 @@ async def sample_get_login_profile():
626626
# and friendly error handling.
627627
rpc = gapic_v1.method_async.wrap_method(
628628
self._client._transport.get_login_profile,
629-
default_retry=retries.Retry(
629+
default_retry=retries.AsyncRetry(
630630
initial=0.1,
631631
maximum=60.0,
632632
multiplier=1.3,
@@ -707,7 +707,7 @@ async def sample_get_ssh_public_key():
707707
This corresponds to the ``name`` field
708708
on the ``request`` instance; if ``request`` is provided, this
709709
should not be set.
710-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
710+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
711711
should be retried.
712712
timeout (float): The timeout for this request.
713713
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -740,7 +740,7 @@ async def sample_get_ssh_public_key():
740740
# and friendly error handling.
741741
rpc = gapic_v1.method_async.wrap_method(
742742
self._client._transport.get_ssh_public_key,
743-
default_retry=retries.Retry(
743+
default_retry=retries.AsyncRetry(
744744
initial=0.1,
745745
maximum=60.0,
746746
multiplier=1.3,
@@ -838,7 +838,7 @@ async def sample_import_ssh_public_key():
838838
This corresponds to the ``project_id`` field
839839
on the ``request`` instance; if ``request`` is provided, this
840840
should not be set.
841-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
841+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
842842
should be retried.
843843
timeout (float): The timeout for this request.
844844
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -875,7 +875,7 @@ async def sample_import_ssh_public_key():
875875
# and friendly error handling.
876876
rpc = gapic_v1.method_async.wrap_method(
877877
self._client._transport.import_ssh_public_key,
878-
default_retry=retries.Retry(
878+
default_retry=retries.AsyncRetry(
879879
initial=0.1,
880880
maximum=60.0,
881881
multiplier=1.3,
@@ -973,7 +973,7 @@ async def sample_update_ssh_public_key():
973973
This corresponds to the ``update_mask`` field
974974
on the ``request`` instance; if ``request`` is provided, this
975975
should not be set.
976-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
976+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
977977
should be retried.
978978
timeout (float): The timeout for this request.
979979
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -1010,7 +1010,7 @@ async def sample_update_ssh_public_key():
10101010
# and friendly error handling.
10111011
rpc = gapic_v1.method_async.wrap_method(
10121012
self._client._transport.update_ssh_public_key,
1013-
default_retry=retries.Retry(
1013+
default_retry=retries.AsyncRetry(
10141014
initial=0.1,
10151015
maximum=60.0,
10161016
multiplier=1.3,

‎packages/google-cloud-os-login/noxfile.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
DEFAULT_PYTHON_VERSION = "3.10"
3737

38-
UNIT_TEST_PYTHON_VERSIONS: List[str] = ["3.7", "3.8", "3.9", "3.10", "3.11"]
38+
UNIT_TEST_PYTHON_VERSIONS: List[str] = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
3939
UNIT_TEST_STANDARD_DEPENDENCIES = [
4040
"mock",
4141
"asyncmock",
@@ -49,7 +49,7 @@
4949
UNIT_TEST_EXTRAS: List[str] = []
5050
UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
5151

52-
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.8", "3.9", "3.10", "3.11"]
52+
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.8", "3.9", "3.10", "3.11", "3.12"]
5353
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
5454
"mock",
5555
"pytest",
@@ -339,7 +339,7 @@ def docfx(session):
339339
)
340340

341341

342-
@nox.session(python="3.11")
342+
@nox.session(python="3.12")
343343
def prerelease_deps(session):
344344
"""Run all tests with prerelease versions of dependencies installed."""
345345

‎packages/google-cloud-os-login/setup.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#
1616
import io
1717
import os
18+
import re
1819

1920
import setuptools # type: ignore
2021

@@ -25,10 +26,12 @@
2526

2627
description = "Google Cloud Os Login API client library"
2728

28-
version = {}
29+
version = None
30+
2931
with open(os.path.join(package_root, "google/cloud/oslogin/gapic_version.py")) as fp:
30-
exec(fp.read(), version)
31-
version = version["__version__"]
32+
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
33+
assert len(version_candidates) == 1
34+
version = version_candidates[0]
3235

3336
if version[0] == "0":
3437
release_status = "Development Status :: 4 - Beta"
@@ -37,11 +40,10 @@
3740

3841
dependencies = [
3942
"google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
40-
"proto-plus >= 1.22.0, <2.0.0dev",
41-
"proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
43+
"proto-plus >= 1.22.3, <2.0.0dev",
4244
"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",
4345
]
44-
url = "https://github.com/googleapis/google-cloud-python"
46+
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-login"
4547

4648
package_root = os.path.abspath(os.path.dirname(__file__))
4749

@@ -51,12 +53,10 @@
5153

5254
packages = [
5355
package
54-
for package in setuptools.PEP420PackageFinder.find()
56+
for package in setuptools.find_namespace_packages()
5557
if package.startswith("google")
5658
]
5759

58-
namespaces = ["google", "google.cloud"]
59-
6060
setuptools.setup(
6161
name=name,
6262
version=version,
@@ -77,13 +77,13 @@
7777
"Programming Language :: Python :: 3.9",
7878
"Programming Language :: Python :: 3.10",
7979
"Programming Language :: Python :: 3.11",
80+
"Programming Language :: Python :: 3.12",
8081
"Operating System :: OS Independent",
8182
"Topic :: Internet",
8283
],
8384
platforms="Posix; MacOS X; Windows",
8485
packages=packages,
8586
python_requires=">=3.7",
86-
namespace_packages=namespaces,
8787
install_requires=dependencies,
8888
include_package_data=True,
8989
zip_safe=False,

‎packages/google-cloud-os-login/testing/constraints-3.7.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
66
# Then this file should have google-cloud-foo==1.14.0
77
google-api-core==1.34.0
8-
proto-plus==1.22.0
8+
proto-plus==1.22.3
99
protobuf==3.19.5

‎packages/google-cloud-private-catalog/CONTRIBUTING.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In order to add a feature:
2222
documentation.
2323

2424
- The feature must work fully on the following CPython versions:
25-
3.7, 3.8, 3.9, 3.10 and 3.11 on both UNIX and Windows.
25+
3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.
2626

2727
- The feature must not add unnecessary dependencies (where
2828
"unnecessary" is of course subjective, but new dependencies should
@@ -72,7 +72,7 @@ We use `nox <https://nox.readthedocs.io/en/latest/>`__ to instrument our tests.
7272

7373
- To run a single unit test::
7474

75-
$ nox -s unit-3.11 -- -k <name of test>
75+
$ nox -s unit-3.12 -- -k <name of test>
7676

7777

7878
.. note::
@@ -143,12 +143,12 @@ Running System Tests
143143
$ nox -s system
144144

145145
# Run a single system test
146-
$ nox -s system-3.11 -- -k <name of test>
146+
$ nox -s system-3.12 -- -k <name of test>
147147

148148

149149
.. note::
150150

151-
System tests are only configured to run under Python 3.8, 3.9, 3.10 and 3.11.
151+
System tests are only configured to run under Python 3.8, 3.9, 3.10, 3.11 and 3.12.
152152
For expediency, we do not run them in older versions of Python 3.
153153

154154
This alone will not run the tests. You'll need to change some local
@@ -226,12 +226,14 @@ We support:
226226
- `Python 3.9`_
227227
- `Python 3.10`_
228228
- `Python 3.11`_
229+
- `Python 3.12`_
229230

230231
.. _Python 3.7: https://docs.python.org/3.7/
231232
.. _Python 3.8: https://docs.python.org/3.8/
232233
.. _Python 3.9: https://docs.python.org/3.9/
233234
.. _Python 3.10: https://docs.python.org/3.10/
234235
.. _Python 3.11: https://docs.python.org/3.11/
236+
.. _Python 3.12: https://docs.python.org/3.12/
235237

236238

237239
Supported versions can be found in our ``noxfile.py`` `config`_.

‎packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/async_client.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030

3131
from google.api_core import exceptions as core_exceptions
3232
from google.api_core import gapic_v1
33-
from google.api_core import retry as retries
33+
from google.api_core import retry_async as retries
3434
from google.api_core.client_options import ClientOptions
3535
from google.auth import credentials as ga_credentials # type: ignore
3636
from google.oauth2 import service_account # type: ignore
3737

3838
from google.cloud.privatecatalog_v1beta1 import gapic_version as package_version
3939

4040
try:
41-
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
41+
OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault]
4242
except AttributeError: # pragma: NO COVER
43-
OptionalRetry = Union[retries.Retry, object] # type: ignore
43+
OptionalRetry = Union[retries.AsyncRetry, object] # type: ignore
4444

4545
from google.cloud.privatecatalog_v1beta1.services.private_catalog import pagers
4646
from google.cloud.privatecatalog_v1beta1.types import private_catalog
@@ -283,7 +283,7 @@ async def sample_search_catalogs():
283283
request (Optional[Union[google.cloud.privatecatalog_v1beta1.types.SearchCatalogsRequest, dict]]):
284284
The request object. Request message for
285285
[PrivateCatalog.SearchCatalogs][google.cloud.privatecatalog.v1beta1.PrivateCatalog.SearchCatalogs].
286-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
286+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
287287
should be retried.
288288
timeout (float): The timeout for this request.
289289
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -378,7 +378,7 @@ async def sample_search_products():
378378
request (Optional[Union[google.cloud.privatecatalog_v1beta1.types.SearchProductsRequest, dict]]):
379379
The request object. Request message for
380380
[PrivateCatalog.SearchProducts][google.cloud.privatecatalog.v1beta1.PrivateCatalog.SearchProducts].
381-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
381+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
382382
should be retried.
383383
timeout (float): The timeout for this request.
384384
metadata (Sequence[Tuple[str, str]]): Strings which should be
@@ -474,7 +474,7 @@ async def sample_search_versions():
474474
request (Optional[Union[google.cloud.privatecatalog_v1beta1.types.SearchVersionsRequest, dict]]):
475475
The request object. Request message for
476476
[PrivateCatalog.SearchVersions][google.cloud.privatecatalog.v1beta1.PrivateCatalog.SearchVersions].
477-
retry (google.api_core.retry.Retry): Designation of what errors, if any,
477+
retry (google.api_core.retry_async.AsyncRetry): Designation of what errors, if any,
478478
should be retried.
479479
timeout (float): The timeout for this request.
480480
metadata (Sequence[Tuple[str, str]]): Strings which should be

0 commit comments

Comments
 (0)