Skip to content

Commit 955aa30

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (googleapis#372)
* 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>
1 parent 334fdfa commit 955aa30

File tree

179 files changed

+1821
-2592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1821
-2592
lines changed

‎packages/google-cloud-compute/.coveragerc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ exclude_lines =
1010
pragma: NO COVER
1111
# Ignore debug-only repr
1212
def __repr__
13-
# Ignore pkg_resources exceptions.
14-
# This is added at the module level as a safeguard for if someone
15-
# generates the code and tries to run it without pip installing. This
16-
# makes it virtually impossible to test properly.
17-
except pkg_resources.DistributionNotFound

‎packages/google-cloud-compute/google/cloud/compute_v1/gapic_version.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
__version__ = "1.6.1" # {x-release-please-version}

‎packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
from google.auth.transport import mtls # type: ignore
3939
from google.auth.transport.grpc import SslCredentials # type: ignore
4040
from google.oauth2 import service_account # type: ignore
41-
import pkg_resources
41+
42+
from google.cloud.compute_v1 import gapic_version as package_version
4243

4344
try:
4445
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -429,7 +430,7 @@ def aggregated_list(
429430
*,
430431
project: Optional[str] = None,
431432
retry: OptionalRetry = gapic_v1.method.DEFAULT,
432-
timeout: Optional[float] = None,
433+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
433434
metadata: Sequence[Tuple[str, str]] = (),
434435
) -> pagers.AggregatedListPager:
435436
r"""Retrieves an aggregated list of accelerator types.
@@ -516,7 +517,7 @@ def get(
516517
zone: Optional[str] = None,
517518
accelerator_type: Optional[str] = None,
518519
retry: OptionalRetry = gapic_v1.method.DEFAULT,
519-
timeout: Optional[float] = None,
520+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
520521
metadata: Sequence[Tuple[str, str]] = (),
521522
) -> compute.AcceleratorType:
522523
r"""Returns the specified accelerator type.
@@ -622,7 +623,7 @@ def list(
622623
project: Optional[str] = None,
623624
zone: Optional[str] = None,
624625
retry: OptionalRetry = gapic_v1.method.DEFAULT,
625-
timeout: Optional[float] = None,
626+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
626627
metadata: Sequence[Tuple[str, str]] = (),
627628
) -> pagers.ListPager:
628629
r"""Retrieves a list of accelerator types that are
@@ -731,14 +732,9 @@ def __exit__(self, type, value, traceback):
731732
self.transport.close()
732733

733734

734-
try:
735-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
736-
gapic_version=pkg_resources.get_distribution(
737-
"google-cloud-compute",
738-
).version,
739-
)
740-
except pkg_resources.DistributionNotFound:
741-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
735+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
736+
gapic_version=package_version.__version__
737+
)
742738

743739

744740
__all__ = ("AcceleratorTypesClient",)

‎packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@
2323
import google.auth # type: ignore
2424
from google.auth import credentials as ga_credentials # type: ignore
2525
from google.oauth2 import service_account # type: ignore
26-
import pkg_resources
2726

27+
from google.cloud.compute_v1 import gapic_version as package_version
2828
from google.cloud.compute_v1.types import compute
2929

30-
try:
31-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
32-
gapic_version=pkg_resources.get_distribution(
33-
"google-cloud-compute",
34-
).version,
35-
)
36-
except pkg_resources.DistributionNotFound:
37-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
30+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
31+
gapic_version=package_version.__version__
32+
)
3833

3934

4035
class AcceleratorTypesTransport(abc.ABC):

‎packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
from google.auth.transport import mtls # type: ignore
4040
from google.auth.transport.grpc import SslCredentials # type: ignore
4141
from google.oauth2 import service_account # type: ignore
42-
import pkg_resources
42+
43+
from google.cloud.compute_v1 import gapic_version as package_version
4344

4445
try:
4546
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -426,7 +427,7 @@ def aggregated_list(
426427
*,
427428
project: Optional[str] = None,
428429
retry: OptionalRetry = gapic_v1.method.DEFAULT,
429-
timeout: Optional[float] = None,
430+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
430431
metadata: Sequence[Tuple[str, str]] = (),
431432
) -> pagers.AggregatedListPager:
432433
r"""Retrieves an aggregated list of addresses.
@@ -513,7 +514,7 @@ def delete_unary(
513514
region: Optional[str] = None,
514515
address: Optional[str] = None,
515516
retry: OptionalRetry = gapic_v1.method.DEFAULT,
516-
timeout: Optional[float] = None,
517+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
517518
metadata: Sequence[Tuple[str, str]] = (),
518519
) -> compute.Operation:
519520
r"""Deletes the specified address resource.
@@ -612,7 +613,7 @@ def delete(
612613
region: Optional[str] = None,
613614
address: Optional[str] = None,
614615
retry: OptionalRetry = gapic_v1.method.DEFAULT,
615-
timeout: Optional[float] = None,
616+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
616617
metadata: Sequence[Tuple[str, str]] = (),
617618
) -> extended_operation.ExtendedOperation:
618619
r"""Deletes the specified address resource.
@@ -736,7 +737,7 @@ def get(
736737
region: Optional[str] = None,
737738
address: Optional[str] = None,
738739
retry: OptionalRetry = gapic_v1.method.DEFAULT,
739-
timeout: Optional[float] = None,
740+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
740741
metadata: Sequence[Tuple[str, str]] = (),
741742
) -> compute.Address:
742743
r"""Returns the specified address resource.
@@ -839,7 +840,7 @@ def insert_unary(
839840
region: Optional[str] = None,
840841
address_resource: Optional[compute.Address] = None,
841842
retry: OptionalRetry = gapic_v1.method.DEFAULT,
842-
timeout: Optional[float] = None,
843+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
843844
metadata: Sequence[Tuple[str, str]] = (),
844845
) -> compute.Operation:
845846
r"""Creates an address resource in the specified project
@@ -936,7 +937,7 @@ def insert(
936937
region: Optional[str] = None,
937938
address_resource: Optional[compute.Address] = None,
938939
retry: OptionalRetry = gapic_v1.method.DEFAULT,
939-
timeout: Optional[float] = None,
940+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
940941
metadata: Sequence[Tuple[str, str]] = (),
941942
) -> extended_operation.ExtendedOperation:
942943
r"""Creates an address resource in the specified project
@@ -1057,7 +1058,7 @@ def list(
10571058
project: Optional[str] = None,
10581059
region: Optional[str] = None,
10591060
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1060-
timeout: Optional[float] = None,
1061+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
10611062
metadata: Sequence[Tuple[str, str]] = (),
10621063
) -> pagers.ListPager:
10631064
r"""Retrieves a list of addresses contained within the
@@ -1160,7 +1161,7 @@ def set_labels_unary(
11601161
compute.RegionSetLabelsRequest
11611162
] = None,
11621163
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1163-
timeout: Optional[float] = None,
1164+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
11641165
metadata: Sequence[Tuple[str, str]] = (),
11651166
) -> compute.Operation:
11661167
r"""Sets the labels on an Address. To learn more about
@@ -1274,7 +1275,7 @@ def set_labels(
12741275
compute.RegionSetLabelsRequest
12751276
] = None,
12761277
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1277-
timeout: Optional[float] = None,
1278+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
12781279
metadata: Sequence[Tuple[str, str]] = (),
12791280
) -> extended_operation.ExtendedOperation:
12801281
r"""Sets the labels on an Address. To learn more about
@@ -1416,14 +1417,9 @@ def __exit__(self, type, value, traceback):
14161417
self.transport.close()
14171418

14181419

1419-
try:
1420-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
1421-
gapic_version=pkg_resources.get_distribution(
1422-
"google-cloud-compute",
1423-
).version,
1424-
)
1425-
except pkg_resources.DistributionNotFound:
1426-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
1420+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
1421+
gapic_version=package_version.__version__
1422+
)
14271423

14281424

14291425
__all__ = ("AddressesClient",)

‎packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,14 @@
2323
import google.auth # type: ignore
2424
from google.auth import credentials as ga_credentials # type: ignore
2525
from google.oauth2 import service_account # type: ignore
26-
import pkg_resources
2726

27+
from google.cloud.compute_v1 import gapic_version as package_version
2828
from google.cloud.compute_v1.services import region_operations
2929
from google.cloud.compute_v1.types import compute
3030

31-
try:
32-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
33-
gapic_version=pkg_resources.get_distribution(
34-
"google-cloud-compute",
35-
).version,
36-
)
37-
except pkg_resources.DistributionNotFound:
38-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
31+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
32+
gapic_version=package_version.__version__
33+
)
3934

4035

4136
class AddressesTransport(abc.ABC):

‎packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
from google.auth.transport import mtls # type: ignore
4040
from google.auth.transport.grpc import SslCredentials # type: ignore
4141
from google.oauth2 import service_account # type: ignore
42-
import pkg_resources
42+
43+
from google.cloud.compute_v1 import gapic_version as package_version
4344

4445
try:
4546
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -426,7 +427,7 @@ def aggregated_list(
426427
*,
427428
project: Optional[str] = None,
428429
retry: OptionalRetry = gapic_v1.method.DEFAULT,
429-
timeout: Optional[float] = None,
430+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
430431
metadata: Sequence[Tuple[str, str]] = (),
431432
) -> pagers.AggregatedListPager:
432433
r"""Retrieves an aggregated list of autoscalers.
@@ -513,7 +514,7 @@ def delete_unary(
513514
zone: Optional[str] = None,
514515
autoscaler: Optional[str] = None,
515516
retry: OptionalRetry = gapic_v1.method.DEFAULT,
516-
timeout: Optional[float] = None,
517+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
517518
metadata: Sequence[Tuple[str, str]] = (),
518519
) -> compute.Operation:
519520
r"""Deletes the specified autoscaler.
@@ -610,7 +611,7 @@ def delete(
610611
zone: Optional[str] = None,
611612
autoscaler: Optional[str] = None,
612613
retry: OptionalRetry = gapic_v1.method.DEFAULT,
613-
timeout: Optional[float] = None,
614+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
614615
metadata: Sequence[Tuple[str, str]] = (),
615616
) -> extended_operation.ExtendedOperation:
616617
r"""Deletes the specified autoscaler.
@@ -732,7 +733,7 @@ def get(
732733
zone: Optional[str] = None,
733734
autoscaler: Optional[str] = None,
734735
retry: OptionalRetry = gapic_v1.method.DEFAULT,
735-
timeout: Optional[float] = None,
736+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
736737
metadata: Sequence[Tuple[str, str]] = (),
737738
) -> compute.Autoscaler:
738739
r"""Returns the specified autoscaler resource. Gets a
@@ -839,7 +840,7 @@ def insert_unary(
839840
zone: Optional[str] = None,
840841
autoscaler_resource: Optional[compute.Autoscaler] = None,
841842
retry: OptionalRetry = gapic_v1.method.DEFAULT,
842-
timeout: Optional[float] = None,
843+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
843844
metadata: Sequence[Tuple[str, str]] = (),
844845
) -> compute.Operation:
845846
r"""Creates an autoscaler in the specified project using
@@ -936,7 +937,7 @@ def insert(
936937
zone: Optional[str] = None,
937938
autoscaler_resource: Optional[compute.Autoscaler] = None,
938939
retry: OptionalRetry = gapic_v1.method.DEFAULT,
939-
timeout: Optional[float] = None,
940+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
940941
metadata: Sequence[Tuple[str, str]] = (),
941942
) -> extended_operation.ExtendedOperation:
942943
r"""Creates an autoscaler in the specified project using
@@ -1057,7 +1058,7 @@ def list(
10571058
project: Optional[str] = None,
10581059
zone: Optional[str] = None,
10591060
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1060-
timeout: Optional[float] = None,
1061+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
10611062
metadata: Sequence[Tuple[str, str]] = (),
10621063
) -> pagers.ListPager:
10631064
r"""Retrieves a list of autoscalers contained within the
@@ -1159,7 +1160,7 @@ def patch_unary(
11591160
zone: Optional[str] = None,
11601161
autoscaler_resource: Optional[compute.Autoscaler] = None,
11611162
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1162-
timeout: Optional[float] = None,
1163+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
11631164
metadata: Sequence[Tuple[str, str]] = (),
11641165
) -> compute.Operation:
11651166
r"""Updates an autoscaler in the specified project using
@@ -1258,7 +1259,7 @@ def patch(
12581259
zone: Optional[str] = None,
12591260
autoscaler_resource: Optional[compute.Autoscaler] = None,
12601261
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1261-
timeout: Optional[float] = None,
1262+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
12621263
metadata: Sequence[Tuple[str, str]] = (),
12631264
) -> extended_operation.ExtendedOperation:
12641265
r"""Updates an autoscaler in the specified project using
@@ -1382,7 +1383,7 @@ def update_unary(
13821383
zone: Optional[str] = None,
13831384
autoscaler_resource: Optional[compute.Autoscaler] = None,
13841385
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1385-
timeout: Optional[float] = None,
1386+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
13861387
metadata: Sequence[Tuple[str, str]] = (),
13871388
) -> compute.Operation:
13881389
r"""Updates an autoscaler in the specified project using
@@ -1479,7 +1480,7 @@ def update(
14791480
zone: Optional[str] = None,
14801481
autoscaler_resource: Optional[compute.Autoscaler] = None,
14811482
retry: OptionalRetry = gapic_v1.method.DEFAULT,
1482-
timeout: Optional[float] = None,
1483+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
14831484
metadata: Sequence[Tuple[str, str]] = (),
14841485
) -> extended_operation.ExtendedOperation:
14851486
r"""Updates an autoscaler in the specified project using
@@ -1607,14 +1608,9 @@ def __exit__(self, type, value, traceback):
16071608
self.transport.close()
16081609

16091610

1610-
try:
1611-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
1612-
gapic_version=pkg_resources.get_distribution(
1613-
"google-cloud-compute",
1614-
).version,
1615-
)
1616-
except pkg_resources.DistributionNotFound:
1617-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
1611+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
1612+
gapic_version=package_version.__version__
1613+
)
16181614

16191615

16201616
__all__ = ("AutoscalersClient",)

‎packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,14 @@
2323
import google.auth # type: ignore
2424
from google.auth import credentials as ga_credentials # type: ignore
2525
from google.oauth2 import service_account # type: ignore
26-
import pkg_resources
2726

27+
from google.cloud.compute_v1 import gapic_version as package_version
2828
from google.cloud.compute_v1.services import zone_operations
2929
from google.cloud.compute_v1.types import compute
3030

31-
try:
32-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
33-
gapic_version=pkg_resources.get_distribution(
34-
"google-cloud-compute",
35-
).version,
36-
)
37-
except pkg_resources.DistributionNotFound:
38-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
31+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
32+
gapic_version=package_version.__version__
33+
)
3934

4035

4136
class AutoscalersTransport(abc.ABC):

0 commit comments

Comments
 (0)