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

* 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: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b 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>

Author: gcf-owl-bot[bot]

.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

google/cloud/gkeconnect/gateway_v1beta1/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.3" # {x-release-please-version}

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_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.gkeconnect.gateway_v1beta1 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -222,7 +223,7 @@ async def get_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""GetResource performs an HTTP GET request on the
@@ -387,7 +388,7 @@ async def post_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PostResource performs an HTTP POST on the Kubernetes
@@ -552,7 +553,7 @@ async def delete_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""DeleteResource performs an HTTP DELETE on the
@@ -717,7 +718,7 @@ async def put_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PutResource performs an HTTP PUT on the Kubernetes
@@ -882,7 +883,7 @@ async def patch_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PatchResource performs an HTTP PATCH on the
@@ -1049,14 +1050,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-gke-connect-gateway",
- ).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__ = ("GatewayServiceAsyncClient",)

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_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.gkeconnect.gateway_v1beta1 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -429,7 +430,7 @@ def get_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""GetResource performs an HTTP GET request on the
@@ -593,7 +594,7 @@ def post_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PostResource performs an HTTP POST on the Kubernetes
@@ -757,7 +758,7 @@ def delete_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""DeleteResource performs an HTTP DELETE on the
@@ -921,7 +922,7 @@ def put_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PutResource performs an HTTP PUT on the Kubernetes
@@ -1085,7 +1086,7 @@ def patch_resource(
  request: Optional[Union[httpbody_pb2.HttpBody, 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]] = (),
  ) -> httpbody_pb2.HttpBody:
  r"""PatchResource performs an HTTP PATCH on the
@@ -1258,14 +1259,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-gke-connect-gateway",
- ).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__ = ("GatewayServiceClient",)

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_service/transports/base.py

@@ -24,16 +24,12 @@
 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
-
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-gke-connect-gateway",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+
+from google.cloud.gkeconnect.gateway_v1beta1 import gapic_version as package_version
+
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 class GatewayServiceTransport(abc.ABC):

release-please-config.json

@@ -5,6 +5,7 @@
  "release-type": "python",
  "extra-files": [
  "google/cloud/gkeconnect/gateway/gapic_version.py",
+ "google/cloud/gkeconnect/gateway_v1beta1/gapic_version.py",
  {
  "type": "json",
  "path": "samples/generated_samples/snippet_metadata_google.cloud.gkeconnect.gateway.v1beta1.json",

setup.py

@@ -38,7 +38,7 @@
  release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
- "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
+ "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.*",
  "proto-plus >= 1.22.0, <2.0.0dev",
  "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",
 ]

testing/constraints-3.7.txt

@@ -4,6 +4,6 @@
 # Pin the version to the lower bound.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.33.2
+google-api-core==1.34.0
 proto-plus==1.22.0
 protobuf==3.19.5