From 2d75d0e67ca4cccddc688bd37c14ac80564a2e65 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:48:14 +0000 Subject: [PATCH] fix: [Many APIs] fix `ValueError` in `test__validate_universe_domain` (#12280) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 604699565 Source-Link: https://github.com/googleapis/googleapis/commit/cd3eabf5968bbc91685e2eae8efb099e4d55bb5c Source-Link: https://github.com/googleapis/googleapis-gen/commit/01f69ba7a13d59e6f45e243359b91a6e896221f8 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1kYXRhLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtbWVldC8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtc2NyaXB0LXR5cGUvLk93bEJvdC55YW1sIiwiaCI6IjAxZjY5YmE3YTEzZDU5ZTZmNDVlMjQzMzU5YjkxYTZlODk2MjIxZjgifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFyZWExMjAtdGFibGVzLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFjY2Vzcy1hcHByb3ZhbC8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFkdmlzb3J5bm90aWZpY2F0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGItY29ubmVjdG9ycy8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGIvLk93bEJvdC55YW1sIiwiaCI6IjAxZjY5YmE3YTEzZDU5ZTZmNDVlMjQzMzU5YjkxYTZlODk2MjIxZjgifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaS1nYXRld2F5Ly5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaS1rZXlzLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZS1jb25uZWN0Ly5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZS1yZWdpc3RyeS8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwcGVuZ2luZS1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwcGVuZ2luZS1sb2dnaW5nLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc3VyZWQtd29ya2xvYWRzLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWF1dG9tbC8uT3dsQm90LnlhbWwiLCJoIjoiMDFmNjliYTdhMTNkNTllNmY0NWUyNDMzNTliOTFhNmU4OTYyMjFmOCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhcmUtbWV0YWwtc29sdXRpb24vLk93bEJvdC55YW1sIiwiaCI6IjAxZjY5YmE3YTEzZDU5ZTZmNDVlMjQzMzU5YjkxYTZlODk2MjIxZjgifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhdGNoLy5Pd2xCb3QueWFtbCIsImgiOiIwMWY2OWJhN2ExM2Q1OWU2ZjQ1ZTI0MzM1OWI5MWE2ZTg5NjIyMWY4In0= --------- Co-authored-by: Owl Bot Co-authored-by: Victor Chudnovsky --- .../types/retriever.py | 4 ++-- .../permission_service/async_client.py | 18 +++++++++--------- .../services/permission_service/client.py | 18 +++++++++--------- .../permission_service/transports/rest.py | 18 +++++++++--------- .../types/permission.py | 6 +++--- .../test_generative_service.py | 8 ++++---- .../test_model_service.py | 8 ++++---- .../test_discuss_service.py | 8 ++++---- .../test_generative_service.py | 8 ++++---- .../test_model_service.py | 8 ++++---- .../test_permission_service.py | 8 ++++---- .../test_retriever_service.py | 8 ++++---- .../test_text_service.py | 8 ++++---- .../test_discuss_service.py | 8 ++++---- .../test_model_service.py | 8 ++++---- .../test_text_service.py | 8 ++++---- .../test_discuss_service.py | 8 ++++---- .../test_model_service.py | 8 ++++---- .../test_permission_service.py | 8 ++++---- .../test_text_service.py | 8 ++++---- .../analytics_admin_service/async_client.py | 2 +- .../services/analytics_admin_service/client.py | 2 +- .../admin_v1alpha/types/analytics_admin.py | 2 +- .../test_analytics_admin_service.py | 8 ++++---- .../test_analytics_admin_service.py | 8 ++++---- .../data_v1alpha/test_alpha_analytics_data.py | 8 ++++---- .../data_v1beta/test_beta_analytics_data.py | 8 ++++---- .../meet_v2/test_conference_records_service.py | 8 ++++---- .../unit/gapic/meet_v2/test_spaces_service.py | 8 ++++---- .../test_conference_records_service.py | 8 ++++---- .../gapic/meet_v2beta/test_spaces_service.py | 8 ++++---- .../tables_v1alpha1/test_tables_service.py | 8 ++++---- .../accessapproval_v1/test_access_approval.py | 8 ++++---- .../test_advisory_notifications_service.py | 8 ++++---- .../google/cloud/alloydb_v1/types/resources.py | 2 +- .../cloud/alloydb_v1alpha/types/resources.py | 2 +- .../cloud/alloydb_v1beta/types/resources.py | 2 +- .../gapic/alloydb_v1/test_alloy_db_admin.py | 8 ++++---- .../alloydb_v1alpha/test_alloy_db_admin.py | 8 ++++---- .../alloydb_v1beta/test_alloy_db_admin.py | 8 ++++---- .../apigateway_v1/test_api_gateway_service.py | 8 ++++---- .../unit/gapic/api_keys_v2/test_api_keys.py | 8 ++++---- .../test_connection_service.py | 8 ++++---- .../unit/gapic/apigeeconnect_v1/test_tether.py | 8 ++++---- .../apigee_registry_v1/test_provisioning.py | 8 ++++---- .../gapic/apigee_registry_v1/test_registry.py | 8 ++++---- .../appengine_admin_v1/test_applications.py | 8 ++++---- .../test_authorized_certificates.py | 8 ++++---- .../test_authorized_domains.py | 8 ++++---- .../appengine_admin_v1/test_domain_mappings.py | 8 ++++---- .../gapic/appengine_admin_v1/test_firewall.py | 8 ++++---- .../gapic/appengine_admin_v1/test_instances.py | 8 ++++---- .../gapic/appengine_admin_v1/test_services.py | 8 ++++---- .../gapic/appengine_admin_v1/test_versions.py | 8 ++++---- .../test_assured_workloads_service.py | 8 ++++---- .../test_assured_workloads_service.py | 8 ++++---- .../tests/unit/gapic/automl_v1/test_auto_ml.py | 8 ++++---- .../gapic/automl_v1/test_prediction_service.py | 8 ++++---- .../unit/gapic/automl_v1beta1/test_auto_ml.py | 8 ++++---- .../automl_v1beta1/test_prediction_service.py | 8 ++++---- .../test_bare_metal_solution.py | 8 ++++---- .../unit/gapic/batch_v1/test_batch_service.py | 8 ++++---- .../gapic/batch_v1alpha/test_batch_service.py | 8 ++++---- 63 files changed, 246 insertions(+), 246 deletions(-) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py index 31bec83f9e1e..f27e357424e7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py @@ -88,7 +88,7 @@ class Document(proto.Message): Attributes: name (str): Immutable. Identifier. The ``Document`` resource name. The - ID (name excluding the `corpora/*/documents/` prefix) can + ID (name excluding the "corpora/*/documents/" prefix) can contain up to 40 characters that are lowercase alphanumeric or dashes (-). The ID cannot start or end with a dash. If the name is empty on create, a unique name will be derived @@ -315,7 +315,7 @@ class Chunk(proto.Message): Attributes: name (str): Immutable. Identifier. The ``Chunk`` resource name. The ID - (name excluding the `corpora/*/documents/*/chunks/` prefix) + (name excluding the "corpora/*/documents/*/chunks/" prefix) can contain up to 40 characters that are lowercase alphanumeric or dashes (-). The ID cannot start or end with a dash. If the name is empty on create, a random diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py index 1e430898a006..4205eb692a3b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py @@ -343,11 +343,11 @@ async def sample_create_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -473,11 +473,11 @@ async def sample_get_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -729,11 +729,11 @@ async def sample_update_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py index 0cec51904f0b..75b153759e5f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py @@ -764,11 +764,11 @@ def sample_create_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -894,11 +894,11 @@ def sample_get_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -1150,11 +1150,11 @@ def sample_update_permission(): role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py index d6cafaffa50d..7181ffb2f1d5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py @@ -395,11 +395,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -592,11 +592,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -891,11 +891,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py index 09af2311c4ed..115ca22e8bef 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py @@ -41,10 +41,10 @@ class Permission(proto.Message): There are three concentric roles. Each role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and additionally can edit and + - reader can use the resource (e.g. tuned model) for inference + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and additionally can delete + - owner has writer's permissions and additionally can delete .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py index cd2372d102b1..dec7cd76bb70 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py @@ -344,8 +344,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -363,8 +363,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py index db63323153c2..0f912868ed80 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py @@ -319,8 +319,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -338,8 +338,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py index f1d7e206aa05..5ddc8f750bfe 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -352,8 +352,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py index 8553a2bc4868..2555637c29d1 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py @@ -349,8 +349,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -368,8 +368,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py index bf6517b470da..19628147dbf6 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py @@ -332,8 +332,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -351,8 +351,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py index 25cd525833f8..88e3a1ba2e4c 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py @@ -346,8 +346,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -365,8 +365,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py index 39857dbae524..b4f2a76f316b 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py @@ -337,8 +337,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -356,8 +356,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py index 5651b67158fd..c010a08a2387 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py @@ -314,8 +314,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py index 9b229f3381dc..800d0adaf9b6 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py @@ -332,8 +332,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -351,8 +351,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py index f72194207cca..2c7a0b72c0e4 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py @@ -318,8 +318,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -337,8 +337,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py index c72292cb0b64..09e20d7d6e8c 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py @@ -313,8 +313,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -332,8 +332,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py index ff4abe4edd73..39210c3b5bfc 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -352,8 +352,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py index 0d1482f223d4..3631a4f84b59 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py @@ -332,8 +332,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -351,8 +351,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py index 73f7a463b5fe..7a1ac4c2b982 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py @@ -346,8 +346,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -365,8 +365,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py index 3d4bc94bdfc1..11116b8fbfbe 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py @@ -314,8 +314,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py index fa93bda057fd..8a793ceecac8 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py @@ -10603,7 +10603,7 @@ async def create_calculated_metric( metric's resource name. This value should be 1-80 characters and valid - characters are `[a-zA-Z0-9_]`, no spaces allowed. + characters are /[a-zA-Z0-9_]/, no spaces allowed. calculated_metric_id must be unique between all calculated metrics under a property. The calculated_metric_id is used when referencing this diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py index 90206e009e92..3a63a44cfaaf 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py @@ -11606,7 +11606,7 @@ def create_calculated_metric( metric's resource name. This value should be 1-80 characters and valid - characters are `[a-zA-Z0-9_]`, no spaces allowed. + characters are /[a-zA-Z0-9_]/, no spaces allowed. calculated_metric_id must be unique between all calculated metrics under a property. The calculated_metric_id is used when referencing this diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py index 11ebaec3634a..0606a60f7b22 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py @@ -2486,7 +2486,7 @@ class CreateCalculatedMetricRequest(proto.Message): resource name. This value should be 1-80 characters and valid characters - are `[a-zA-Z0-9_]`, no spaces allowed. calculated_metric_id + are /[a-zA-Z0-9_]/, no spaces allowed. calculated_metric_id must be unique between all calculated metrics under a property. The calculated_metric_id is used when referencing this calculated metric from external APIs, for example, diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py index 4b87dfb92a81..03537006986c 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py @@ -376,8 +376,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -395,8 +395,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py index 92d5fc1936b2..a80fc8422933 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py @@ -365,8 +365,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -384,8 +384,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py index 99b13c69b02f..fb05574d379c 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py @@ -358,8 +358,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -377,8 +377,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py index a3731228686d..a597d1e6552a 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py @@ -353,8 +353,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -372,8 +372,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py index 49f6c7097e71..40e80047a7f0 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py @@ -359,8 +359,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -378,8 +378,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py index 9393ead14a55..ee6f28f44d82 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py @@ -329,8 +329,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -348,8 +348,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py index fbbacce1e6f8..981130b7f6de 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py @@ -359,8 +359,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -378,8 +378,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py index 6d2084142dd4..1771a0df3430 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py @@ -329,8 +329,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -348,8 +348,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py index f1c2fc550aec..f4b8de1b2cc2 100644 --- a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py +++ b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py @@ -331,8 +331,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -350,8 +350,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py index 01bd8123a191..ed4574a61fdc 100644 --- a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py +++ b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py @@ -335,8 +335,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -354,8 +354,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py index 0ab78c1cf425..c2d00296cda4 100644 --- a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py +++ b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py @@ -369,8 +369,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -388,8 +388,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py index 5e4c8bd98775..11fc9b0b59b6 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py @@ -1283,7 +1283,7 @@ class QueryInsightsInstanceConfig(proto.Message): query_string_length (int): Query string length. The default value is 1024. Any integer between 256 and 4500 is - considered valid. + considered valid. query_plans_per_minute (int): Number of query execution plans captured by Insights per minute for all queries combined. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py index 6dccd47d271a..3f166e5e79be 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py @@ -1340,7 +1340,7 @@ class QueryInsightsInstanceConfig(proto.Message): query_string_length (int): Query string length. The default value is 1024. Any integer between 256 and 4500 is - considered valid. + considered valid. query_plans_per_minute (int): Number of query execution plans captured by Insights per minute for all queries combined. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py index 5409a6415ad5..4c4baab00f3e 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py @@ -1292,7 +1292,7 @@ class QueryInsightsInstanceConfig(proto.Message): query_string_length (int): Query string length. The default value is 1024. Any integer between 256 and 4500 is - considered valid. + considered valid. query_plans_per_minute (int): Number of query execution plans captured by Insights per minute for all queries combined. diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py index d928f89478b0..b1869f1b8085 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py @@ -338,8 +338,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -357,8 +357,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py index 62b4787aab27..7dd344404e7b 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py @@ -338,8 +338,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -357,8 +357,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py index c4b332a35dce..cafc66132375 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py @@ -338,8 +338,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -357,8 +357,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py index 79e406d0a72d..adf97e2a8ce2 100644 --- a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py +++ b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py @@ -355,8 +355,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -374,8 +374,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py index 3a126372126b..d38d3e296c8a 100644 --- a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py +++ b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py @@ -311,8 +311,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -330,8 +330,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py index cac42d10441a..715468b62c6f 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py @@ -336,8 +336,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -355,8 +355,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py index bc1325056927..a1f66d0fff73 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py @@ -293,8 +293,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -312,8 +312,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py index 9e2ad153de90..25d9aca19e3f 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -352,8 +352,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py index 59fd77f065bd..9e1fb2a28ca4 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py @@ -314,8 +314,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -333,8 +333,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py index c65da13cac94..08912a9ecfe0 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py @@ -330,8 +330,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -349,8 +349,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py index 9eec2fd98ce1..e762f3016614 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py @@ -360,8 +360,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -379,8 +379,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py index 820d7f594a07..b4710bcfb641 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py @@ -342,8 +342,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -361,8 +361,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py index 53149e26bb8a..bfbb590cb1da 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py @@ -346,8 +346,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -365,8 +365,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py index 9f5f17b2ac71..1e9dacfd0ea6 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py @@ -306,8 +306,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -325,8 +325,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py index a3675c4e1a24..0fa1cfad7001 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py @@ -321,8 +321,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -340,8 +340,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py index 82b687338e67..74be83734b5a 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py @@ -319,8 +319,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -338,8 +338,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py index 3150f9167cf1..2c2be4ae10c6 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py @@ -321,8 +321,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -340,8 +340,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py index b3a3e6863fe7..76898dbe98c7 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py @@ -371,8 +371,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -390,8 +390,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py index 2326bdf789ec..28d29d713dca 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py @@ -371,8 +371,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -390,8 +390,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py index 682da1893f3e..a913c50db487 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py @@ -324,8 +324,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -343,8 +343,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py index 28e5c4e244fc..d4739c7c8426 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py @@ -359,8 +359,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -378,8 +378,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py index 15be432620c7..016395254eb8 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py @@ -334,8 +334,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -353,8 +353,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py index 5c6a24abcb62..edac1ea76c59 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py @@ -360,8 +360,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -379,8 +379,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py index 8d69558835fb..459a056ffed7 100644 --- a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py +++ b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py @@ -375,8 +375,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -394,8 +394,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py index b8a351098150..96a60439f084 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py @@ -335,8 +335,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -354,8 +354,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class( diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py index b2f8a9068c5e..0e94990b4810 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py @@ -335,8 +335,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # TODO: This is needed to cater for older versions of google-auth # Make this test unconditional once the minimum supported version of # google-auth becomes 2.23.0 or higher. - google_auth_major, google_auth_minor, _ = [ - int(part) for part in google.auth.__version__.split(".") + google_auth_major, google_auth_minor = [ + int(part) for part in google.auth.__version__.split(".")[0:2] ] if google_auth_major > 2 or (google_auth_major == 2 and google_auth_minor >= 23): credentials = ga_credentials.AnonymousCredentials() @@ -354,8 +354,8 @@ def test__validate_universe_domain(client_class, transport_class, transport_name # # TODO: Make this test unconditional once the minimum supported version of # google-api-core becomes 2.15.0 or higher. - api_core_major, api_core_minor, _ = [ - int(part) for part in api_core_version.__version__.split(".") + api_core_major, api_core_minor = [ + int(part) for part in api_core_version.__version__.split(".")[0:2] ] if api_core_major > 2 or (api_core_major == 2 and api_core_minor >= 15): client = client_class(