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

- [ ] 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/monitoring_metrics_scope_v1/services/metrics_scopes/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.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope
@@ -175,17 +177,17 @@ def __init__(
 
     async def get_metrics_scope(
         self,
-        request: metrics_scopes.GetMetricsScopeRequest = None,
+        request: Union[metrics_scopes.GetMetricsScopeRequest, 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]] = (),
     ) -> metrics_scope.MetricsScope:
         r"""Returns a specific ``Metrics Scope``.
 
         Args:
-            request (:class:`google.cloud.monitoring_metrics_scope_v1.types.GetMetricsScopeRequest`):
+            request (Union[google.cloud.monitoring_metrics_scope_v1.types.GetMetricsScopeRequest, dict]):
                 The request object. Request for the `GetMetricsScope`
                 method.
             name (:class:`str`):
@@ -250,9 +252,11 @@ async def get_metrics_scope(
 
     async def list_metrics_scopes_by_monitored_project(
         self,
-        request: metrics_scopes.ListMetricsScopesByMonitoredProjectRequest = None,
+        request: Union[
+            metrics_scopes.ListMetricsScopesByMonitoredProjectRequest, dict
+        ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> metrics_scopes.ListMetricsScopesByMonitoredProjectResponse:
@@ -262,7 +266,7 @@ async def list_metrics_scopes_by_monitored_project(
         first entry in the response.
 
         Args:
-            request (:class:`google.cloud.monitoring_metrics_scope_v1.types.ListMetricsScopesByMonitoredProjectRequest`):
+            request (Union[google.cloud.monitoring_metrics_scope_v1.types.ListMetricsScopesByMonitoredProjectRequest, dict]):
                 The request object. Request for the
                 `ListMetricsScopesByMonitoredProject` method.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -296,19 +300,19 @@ async def list_metrics_scopes_by_monitored_project(
 
     async def create_monitored_project(
         self,
-        request: metrics_scopes.CreateMonitoredProjectRequest = None,
+        request: Union[metrics_scopes.CreateMonitoredProjectRequest, dict] = None,
         *,
         parent: str = None,
         monitored_project: metrics_scope.MonitoredProject = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Adds a ``MonitoredProject`` with the given project ID to the
         specified ``Metrics Scope``.
 
         Args:
-            request (:class:`google.cloud.monitoring_metrics_scope_v1.types.CreateMonitoredProjectRequest`):
+            request (Union[google.cloud.monitoring_metrics_scope_v1.types.CreateMonitoredProjectRequest, dict]):
                 The request object. Request for the
                 `CreateMonitoredProject` method.
             parent (:class:`str`):
@@ -395,18 +399,18 @@ async def create_monitored_project(
 
     async def delete_monitored_project(
         self,
-        request: metrics_scopes.DeleteMonitoredProjectRequest = None,
+        request: Union[metrics_scopes.DeleteMonitoredProjectRequest, 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]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a ``MonitoredProject`` from the specified
         ``Metrics Scope``.
 
         Args:
-            request (:class:`google.cloud.monitoring_metrics_scope_v1.types.DeleteMonitoredProjectRequest`):
+            request (Union[google.cloud.monitoring_metrics_scope_v1.types.DeleteMonitoredProjectRequest, dict]):
                 The request object. Request for the
                 `DeleteMonitoredProject` method.
             name (:class:`str`):

google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope
@@ -369,7 +371,7 @@ def get_metrics_scope(
         request: Union[metrics_scopes.GetMetricsScopeRequest, 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]] = (),
     ) -> metrics_scope.MetricsScope:
@@ -445,7 +447,7 @@ def list_metrics_scopes_by_monitored_project(
             metrics_scopes.ListMetricsScopesByMonitoredProjectRequest, dict
         ] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> metrics_scopes.ListMetricsScopesByMonitoredProjectResponse:
@@ -498,7 +500,7 @@ def create_monitored_project(
         *,
         parent: str = None,
         monitored_project: metrics_scope.MonitoredProject = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -596,7 +598,7 @@ def delete_monitored_project(
         request: Union[metrics_scopes.DeleteMonitoredProjectRequest, 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]] = (),
     ) -> operation.Operation:

google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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
@@ -40,15 +39,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 MetricsScopesTransport(abc.ABC):
     """Abstract transport class for MetricsScopes."""
@@ -103,7 +93,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
@@ -136,29 +126,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 = {
@@ -192,7 +159,7 @@ def close(self):
         raise NotImplementedError()
 
     @property
-    def operations_client(self) -> operations_v1.OperationsClient:
+    def operations_client(self):
         """Return the client designed to process long-running operations."""
         raise NotImplementedError()
 

google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py

@@ -114,7 +114,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py

@@ -21,7 +21,6 @@
 from google.api_core import operations_v1  # 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
@@ -161,7 +160,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

setup.py

@@ -39,9 +39,8 @@
     platforms="Posix; MacOS X; Windows",
     include_package_data=True,
     install_requires=(
-        "google-api-core[grpc] >= 1.27.0, < 3.0.0dev",
+        "google-api-core[grpc] >= 1.28.0, < 3.0.0dev",
         "proto-plus >= 1.15.0",
-        "packaging >= 14.3",
     ),
     python_requires=">=3.6",
     classifiers=[

testing/constraints-3.6.txt

@@ -5,9 +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.27.0
+google-api-core==1.28.0
 proto-plus==1.15.0
-packaging==14.3
-# TODO: remove when google-auth>=1.25.0 is required transitively through
-# google-api-core >= 1.28.0
-google-auth==1.24.0