chore: use gapic-generator-python 0.53.4 (#63)

- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

Author: gcf-owl-bot[bot]

google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py

@@ -19,13 +19,15 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-import google.api_core.client_options as ClientOptions  # type: ignore
+from google.api_core.client_options import ClientOptions  # type: ignore
 from google.api_core import exceptions as core_exceptions  # type: ignore
 from google.api_core import gapic_v1  # type: ignore
 from google.api_core import retry as retries  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.essential_contacts_v1.services.essential_contacts_service import (
     pagers,
 )
@@ -173,18 +175,18 @@ def __init__(
 
     async def create_contact(
         self,
-        request: service.CreateContactRequest = None,
+        request: Union[service.CreateContactRequest, dict] = None,
         *,
         parent: str = None,
         contact: service.Contact = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
         r"""Adds a new contact for a resource.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.CreateContactRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.CreateContactRequest, dict]):
                 The request object. Request message for the
                 CreateContact method.
             parent (:class:`str`):
@@ -256,19 +258,19 @@ async def create_contact(
 
     async def update_contact(
         self,
-        request: service.UpdateContactRequest = None,
+        request: Union[service.UpdateContactRequest, dict] = None,
         *,
         contact: service.Contact = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
         r"""Updates a contact.
         Note: A contact's email address cannot be changed.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.UpdateContactRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.UpdateContactRequest, dict]):
                 The request object. Request message for the
                 UpdateContact method.
             contact (:class:`google.cloud.essential_contacts_v1.types.Contact`):
@@ -343,17 +345,17 @@ async def update_contact(
 
     async def list_contacts(
         self,
-        request: service.ListContactsRequest = None,
+        request: Union[service.ListContactsRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListContactsAsyncPager:
         r"""Lists the contacts that have been set on a resource.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.ListContactsRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.ListContactsRequest, dict]):
                 The request object. Request message for the ListContacts
                 method.
             parent (:class:`str`):
@@ -433,17 +435,17 @@ async def list_contacts(
 
     async def get_contact(
         self,
-        request: service.GetContactRequest = None,
+        request: Union[service.GetContactRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
         r"""Gets a single contact.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.GetContactRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.GetContactRequest, dict]):
                 The request object. Request message for the GetContact
                 method.
             name (:class:`str`):
@@ -515,17 +517,17 @@ async def get_contact(
 
     async def delete_contact(
         self,
-        request: service.DeleteContactRequest = None,
+        request: Union[service.DeleteContactRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Deletes a contact.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.DeleteContactRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.DeleteContactRequest, dict]):
                 The request object. Request message for the
                 DeleteContact method.
             name (:class:`str`):
@@ -581,9 +583,9 @@ async def delete_contact(
 
     async def compute_contacts(
         self,
-        request: service.ComputeContactsRequest = None,
+        request: Union[service.ComputeContactsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ComputeContactsAsyncPager:
@@ -592,7 +594,7 @@ async def compute_contacts(
         including contacts inherited from any parent resources.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.ComputeContactsRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.ComputeContactsRequest, dict]):
                 The request object. Request message for the
                 ComputeContacts method.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -641,17 +643,17 @@ async def compute_contacts(
 
     async def send_test_message(
         self,
-        request: service.SendTestMessageRequest = None,
+        request: Union[service.SendTestMessageRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Allows a contact admin to send a test message to
         contact to verify that it has been configured correctly.
 
         Args:
-            request (:class:`google.cloud.essential_contacts_v1.types.SendTestMessageRequest`):
+            request (Union[google.cloud.essential_contacts_v1.types.SendTestMessageRequest, dict]):
                 The request object. Request message for the
                 SendTestMessage method.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,

google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py

@@ -30,6 +30,8 @@
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.essential_contacts_v1.services.essential_contacts_service import (
     pagers,
 )
@@ -357,7 +359,7 @@ def create_contact(
         *,
         parent: str = None,
         contact: service.Contact = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
@@ -440,7 +442,7 @@ def update_contact(
         *,
         contact: service.Contact = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
@@ -526,7 +528,7 @@ def list_contacts(
         request: Union[service.ListContactsRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListContactsPager:
@@ -607,7 +609,7 @@ def get_contact(
         request: Union[service.GetContactRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> service.Contact:
@@ -680,7 +682,7 @@ def delete_contact(
         request: Union[service.DeleteContactRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
@@ -745,7 +747,7 @@ def compute_contacts(
         self,
         request: Union[service.ComputeContactsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ComputeContactsPager:
@@ -806,7 +808,7 @@ def send_test_message(
         self,
         request: Union[service.SendTestMessageRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:

google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py

@@ -15,7 +15,6 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth  # type: ignore
@@ -38,15 +37,6 @@
 except pkg_resources.DistributionNotFound:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
 
-try:
-    # google.auth.__version__ was added in 1.26.0
-    _GOOGLE_AUTH_VERSION = google.auth.__version__
-except AttributeError:
-    try:  # try pkg_resources if it is available
-        _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
-    except pkg_resources.DistributionNotFound:  # pragma: NO COVER
-        _GOOGLE_AUTH_VERSION = None
-
 
 class EssentialContactsServiceTransport(abc.ABC):
     """Abstract transport class for EssentialContactsService."""
@@ -96,7 +86,7 @@ def __init__(
             host += ":443"
         self._host = host
 
-        scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
+        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
         # Save the scopes.
         self._scopes = scopes
@@ -129,29 +119,6 @@ def __init__(
         # Save the credentials.
         self._credentials = credentials
 
-    # TODO(busunkim): This method is in the base transport
-    # to avoid duplicating code across the transport classes. These functions
-    # should be deleted once the minimum required versions of google-auth is increased.
-
-    # TODO: Remove this function once google-auth >= 1.25.0 is required
-    @classmethod
-    def _get_scopes_kwargs(
-        cls, host: str, scopes: Optional[Sequence[str]]
-    ) -> Dict[str, Optional[Sequence[str]]]:
-        """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
-
-        scopes_kwargs = {}
-
-        if _GOOGLE_AUTH_VERSION and (
-            packaging.version.parse(_GOOGLE_AUTH_VERSION)
-            >= packaging.version.parse("1.25.0")
-        ):
-            scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
-        else:
-            scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
-
-        return scopes_kwargs
-
     def _prep_wrapped_messages(self, client_info):
         # Precompute the wrapped methods.
         self._wrapped_methods = {

google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py

@@ -20,7 +20,6 @@
 from google.api_core import grpc_helpers_async  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-import packaging.version
 
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore

setup.py

@@ -25,9 +25,8 @@
     # NOTE: Maintainers, please do not require google-api-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
-    "google-api-core[grpc] >= 1.26.0, <3.0.0dev",
+    "google-api-core[grpc] >= 1.28.0, <3.0.0dev",
     "proto-plus >= 1.15.0",
-    "packaging >= 14.3",
 ]
 
 package_root = os.path.abspath(os.path.dirname(__file__))

testing/constraints-3.6.txt

@@ -5,7 +5,5 @@
 #
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-google-api-core==1.26.0
+google-api-core==1.28.0
 proto-plus==1.15.0
-packaging==14.3
-google-auth==1.24.0  # TODO: remove when google-auth>=1.25.0 is transitively required through google-api-core