diff --git a/.coveragerc b/.coveragerc index 00ae33c..52da01d 100644 --- a/.coveragerc +++ b/.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/google/cloud/servicemanagement_v1/gapic_version.py b/google/cloud/servicemanagement_v1/gapic_version.py new file mode 100644 index 0000000..e370372 --- /dev/null +++ b/google/cloud/servicemanagement_v1/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__ = "1.3.3" # {x-release-please-version} diff --git a/google/cloud/servicemanagement_v1/services/service_manager/async_client.py b/google/cloud/servicemanagement_v1/services/service_manager/async_client.py index 0c02569..3a43e60 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/async_client.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/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.servicemanagement_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -248,7 +249,7 @@ async def list_services( producer_project_id: Optional[str] = None, consumer_id: Optional[str] = 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.ListServicesAsyncPager: r"""Lists managed services. @@ -371,7 +372,7 @@ async def get_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.ManagedService: r"""Gets a managed service. Authentication is required @@ -478,7 +479,7 @@ async def create_service( *, service: Optional[resources.ManagedService] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Creates a new managed service. @@ -517,7 +518,7 @@ async def sample_create_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -597,7 +598,7 @@ async def delete_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Deletes a managed service. This method will change the service @@ -634,7 +635,7 @@ async def sample_delete_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -732,7 +733,7 @@ async def undelete_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Revives a previously deleted managed service. The @@ -768,7 +769,7 @@ async def sample_undelete_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -859,7 +860,7 @@ async def list_service_configs( *, service_name: Optional[str] = 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.ListServiceConfigsAsyncPager: r"""Lists the history of the service configuration for a @@ -981,7 +982,7 @@ async def get_service_config( config_id: Optional[str] = None, view: Optional[servicemanager.GetServiceConfigRequest.ConfigView] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> service_pb2.Service: r"""Gets a service configuration (version) for a managed @@ -1143,7 +1144,7 @@ async def create_service_config( service_name: Optional[str] = None, service_config: Optional[service_pb2.Service] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> service_pb2.Service: r"""Creates a new service configuration (version) for a managed @@ -1295,7 +1296,7 @@ async def submit_config_source( config_source: Optional[resources.ConfigSource] = None, validate_only: Optional[bool] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Creates a new service configuration (version) for a managed @@ -1337,7 +1338,7 @@ async def sample_submit_config_source(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1451,7 +1452,7 @@ async def list_service_rollouts( service_name: Optional[str] = None, filter: Optional[str] = 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.ListServiceRolloutsAsyncPager: r"""Lists the history of the service configuration @@ -1590,7 +1591,7 @@ async def get_service_rollout( service_name: Optional[str] = None, rollout_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Rollout: r"""Gets a service configuration @@ -1717,7 +1718,7 @@ async def create_service_rollout( service_name: Optional[str] = None, rollout: Optional[resources.Rollout] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Creates a new service configuration rollout. Based on @@ -1763,7 +1764,7 @@ async def sample_create_service_rollout(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1867,7 +1868,7 @@ async def generate_config_report( new_config: Optional[any_pb2.Any] = None, old_config: Optional[any_pb2.Any] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> servicemanager.GenerateConfigReportResponse: r"""Generates and returns a report (errors, warnings and changes @@ -1991,14 +1992,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-service-management", - ).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__ = ("ServiceManagerAsyncClient",) diff --git a/google/cloud/servicemanagement_v1/services/service_manager/client.py b/google/cloud/servicemanagement_v1/services/service_manager/client.py index a07e5ca..9970de4 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/client.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/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.servicemanagement_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -455,7 +456,7 @@ def list_services( producer_project_id: Optional[str] = None, consumer_id: Optional[str] = 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.ListServicesPager: r"""Lists managed services. @@ -578,7 +579,7 @@ def get_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.ManagedService: r"""Gets a managed service. Authentication is required @@ -685,7 +686,7 @@ def create_service( *, service: Optional[resources.ManagedService] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Creates a new managed service. @@ -804,7 +805,7 @@ def delete_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Deletes a managed service. This method will change the service @@ -939,7 +940,7 @@ def undelete_service( *, service_name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Revives a previously deleted managed service. The @@ -1066,7 +1067,7 @@ def list_service_configs( *, service_name: Optional[str] = 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.ListServiceConfigsPager: r"""Lists the history of the service configuration for a @@ -1188,7 +1189,7 @@ def get_service_config( config_id: Optional[str] = None, view: Optional[servicemanager.GetServiceConfigRequest.ConfigView] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> service_pb2.Service: r"""Gets a service configuration (version) for a managed @@ -1350,7 +1351,7 @@ def create_service_config( service_name: Optional[str] = None, service_config: Optional[service_pb2.Service] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> service_pb2.Service: r"""Creates a new service configuration (version) for a managed @@ -1502,7 +1503,7 @@ def submit_config_source( config_source: Optional[resources.ConfigSource] = None, validate_only: Optional[bool] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Creates a new service configuration (version) for a managed @@ -1658,7 +1659,7 @@ def list_service_rollouts( service_name: Optional[str] = None, filter: Optional[str] = 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.ListServiceRolloutsPager: r"""Lists the history of the service configuration @@ -1797,7 +1798,7 @@ def get_service_rollout( service_name: Optional[str] = None, rollout_id: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Rollout: r"""Gets a service configuration @@ -1924,7 +1925,7 @@ def create_service_rollout( service_name: Optional[str] = None, rollout: Optional[resources.Rollout] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Creates a new service configuration rollout. Based on @@ -2074,7 +2075,7 @@ def generate_config_report( new_config: Optional[any_pb2.Any] = None, old_config: Optional[any_pb2.Any] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> servicemanager.GenerateConfigReportResponse: r"""Generates and returns a report (errors, warnings and changes @@ -2205,14 +2206,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-service-management", - ).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__ = ("ServiceManagerClient",) diff --git a/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py b/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py index 2beae87..0fe6a16 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py @@ -25,18 +25,13 @@ from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources +from google.cloud.servicemanagement_v1 import gapic_version as package_version from google.cloud.servicemanagement_v1.types import resources, servicemanager -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-service-management", - ).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 ServiceManagerTransport(abc.ABC): diff --git a/release-please-config.json b/release-please-config.json index 5654900..adcf8b9 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -4,6 +4,7 @@ ".": { "release-type": "python", "extra-files": [ + "google/cloud/servicemanagement_v1/gapic_version.py", "google/cloud/servicemanagement/gapic_version.py", { "type": "json", diff --git a/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_async.py b/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_async.py index 44db38c..da4de14 100644 --- a/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_async.py +++ b/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_async.py @@ -47,7 +47,7 @@ async def sample_create_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_rollout_async.py b/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_rollout_async.py index 96ced4d..5167e04 100644 --- a/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_rollout_async.py +++ b/samples/generated_samples/servicemanagement_v1_generated_service_manager_create_service_rollout_async.py @@ -48,7 +48,7 @@ async def sample_create_service_rollout(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/servicemanagement_v1_generated_service_manager_delete_service_async.py b/samples/generated_samples/servicemanagement_v1_generated_service_manager_delete_service_async.py index e3ac5dc..62bfa26 100644 --- a/samples/generated_samples/servicemanagement_v1_generated_service_manager_delete_service_async.py +++ b/samples/generated_samples/servicemanagement_v1_generated_service_manager_delete_service_async.py @@ -48,7 +48,7 @@ async def sample_delete_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/servicemanagement_v1_generated_service_manager_submit_config_source_async.py b/samples/generated_samples/servicemanagement_v1_generated_service_manager_submit_config_source_async.py index e4e6354..c074291 100644 --- a/samples/generated_samples/servicemanagement_v1_generated_service_manager_submit_config_source_async.py +++ b/samples/generated_samples/servicemanagement_v1_generated_service_manager_submit_config_source_async.py @@ -48,7 +48,7 @@ async def sample_submit_config_source(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/servicemanagement_v1_generated_service_manager_undelete_service_async.py b/samples/generated_samples/servicemanagement_v1_generated_service_manager_undelete_service_async.py index 50d7be8..e8b02a7 100644 --- a/samples/generated_samples/servicemanagement_v1_generated_service_manager_undelete_service_async.py +++ b/samples/generated_samples/servicemanagement_v1_generated_service_manager_undelete_service_async.py @@ -48,7 +48,7 @@ async def sample_undelete_service(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/setup.py b/setup.py index b87f472..3b138df 100644 --- a/setup.py +++ b/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", ] diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 6f3158c..6c44adf 100644 --- a/testing/constraints-3.7.txt +++ b/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