fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (#160)

* fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: googleapis/googleapis-gen@387b734 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
googleapis · Dec 7, 2022 · d7781f2 · d7781f2
1 parent e232c62
commit d7781f2
Show file tree

Hide file tree

Showing 23 changed files with 139 additions and 205 deletions.
diff --git a/packages/google-cloud-dataflow-client/.coveragerc b/packages/google-cloud-dataflow-client/.coveragerc
@@ -10,8 +10,3 @@ exclude_lines =
  pragma: NO COVER
  # Ignore debug-only repr
  def __repr__
- # Ignore pkg_resources exceptions.
- # This is added at the module level as a safeguard for if someone
- # generates the code and tries to run it without pip installing. This
- # makes it virtually impossible to test properly.
- except pkg_resources.DistributionNotFound
diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/gapic_version.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/gapic_version.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "0.6.2" # {x-release-please-version}
diff --git a/...flow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py b/...flow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py
@@ -34,7 +34,8 @@
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -218,7 +219,7 @@ async def launch_flex_template(
  request: Optional[Union[templates.LaunchFlexTemplateRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> templates.LaunchFlexTemplateResponse:
  r"""Launch a job with a FlexTemplate.
@@ -304,14 +305,9 @@ async def __aexit__(self, exc_type, exc, tb):
  await self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("FlexTemplatesServiceAsyncClient",)
diff --git a/...d-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py b/...d-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py
@@ -38,7 +38,8 @@
 from google.auth.transport import mtls # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -426,7 +427,7 @@ def launch_flex_template(
  request: Optional[Union[templates.LaunchFlexTemplateRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> templates.LaunchFlexTemplateResponse:
  r"""Launch a job with a FlexTemplate.
@@ -520,14 +521,9 @@ def __exit__(self, type, value, traceback):
  self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("FlexTemplatesServiceClient",)
diff --git a/...w-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py b/...w-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py
@@ -23,18 +23,13 @@
 import google.auth # type: ignore
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
 
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 from google.cloud.dataflow_v1beta3.types import templates
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 class FlexTemplatesServiceTransport(abc.ABC):

diff --git a/...loud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py b/...loud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py
@@ -34,7 +34,8 @@
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -218,7 +219,7 @@ async def create_job(
  request: Optional[Union[jobs.CreateJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Creates a Cloud Dataflow job.
@@ -308,7 +309,7 @@ async def get_job(
  request: Optional[Union[jobs.GetJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Gets the state of the specified Cloud Dataflow job.
@@ -399,7 +400,7 @@ async def update_job(
  request: Optional[Union[jobs.UpdateJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Updates the state of an existing Cloud Dataflow job.
@@ -491,7 +492,7 @@ async def list_jobs(
  request: Optional[Union[jobs.ListJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListJobsAsyncPager:
  r"""List the jobs of a project.
@@ -602,7 +603,7 @@ async def aggregated_list_jobs(
  request: Optional[Union[jobs.ListJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.AggregatedListJobsAsyncPager:
  r"""List the jobs of a project across all regions.
@@ -702,7 +703,7 @@ async def check_active_jobs(
  request: Optional[Union[jobs.CheckActiveJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.CheckActiveJobsResponse:
  r"""Check for existence of active jobs in the given
@@ -774,7 +775,7 @@ async def snapshot_job(
  request: Optional[Union[jobs.SnapshotJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> snapshots.Snapshot:
  r"""Snapshot the state of a streaming job.
@@ -859,14 +860,9 @@ async def __aexit__(self, exc_type, exc, tb):
  await self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("JobsV1Beta3AsyncClient",)
diff --git a/...ogle-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py b/...ogle-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py
@@ -38,7 +38,8 @@
 from google.auth.transport import mtls # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -429,7 +430,7 @@ def create_job(
  request: Optional[Union[jobs.CreateJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Creates a Cloud Dataflow job.
@@ -520,7 +521,7 @@ def get_job(
  request: Optional[Union[jobs.GetJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Gets the state of the specified Cloud Dataflow job.
@@ -612,7 +613,7 @@ def update_job(
  request: Optional[Union[jobs.UpdateJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.Job:
  r"""Updates the state of an existing Cloud Dataflow job.
@@ -705,7 +706,7 @@ def list_jobs(
  request: Optional[Union[jobs.ListJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListJobsPager:
  r"""List the jobs of a project.
@@ -817,7 +818,7 @@ def aggregated_list_jobs(
  request: Optional[Union[jobs.ListJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.AggregatedListJobsPager:
  r"""List the jobs of a project across all regions.
@@ -918,7 +919,7 @@ def check_active_jobs(
  request: Optional[Union[jobs.CheckActiveJobsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> jobs.CheckActiveJobsResponse:
  r"""Check for existence of active jobs in the given
@@ -991,7 +992,7 @@ def snapshot_job(
  request: Optional[Union[jobs.SnapshotJobRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> snapshots.Snapshot:
  r"""Snapshot the state of a streaming job.
@@ -1084,14 +1085,9 @@ def __exit__(self, type, value, traceback):
  self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("JobsV1Beta3Client",)
diff --git a/...d-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py b/...d-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py
@@ -23,18 +23,13 @@
 import google.auth # type: ignore
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
 
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 from google.cloud.dataflow_v1beta3.types import jobs, snapshots
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 class JobsV1Beta3Transport(abc.ABC):

diff --git a/...-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py b/...-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py
@@ -34,7 +34,8 @@
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.dataflow_v1beta3 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -218,7 +219,7 @@ async def list_job_messages(
  request: Optional[Union[messages.ListJobMessagesRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListJobMessagesAsyncPager:
  r"""Request the job status.
@@ -329,14 +330,9 @@ async def __aexit__(self, exc_type, exc, tb):
  await self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-dataflow-client",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("MessagesV1Beta3AsyncClient",)