From dbae221af59a96763da82263f191cbe977321eef Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Thu, 15 Jul 2021 11:28:16 -0400 Subject: [PATCH 1/3] chore: pin 'google-{api,cloud}-core' to allow 2.x versions --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fcfee67800..998cf08d67 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.26.0, <2.0.0dev", - "google-cloud-core >= 1.4.1, < 2.0dev", + "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-cloud-core >= 1.4.1, < 3.0dev", "grpc-google-iam-v1 >= 0.12.3, < 0.13dev", "proto-plus >= 1.11.0", "sqlparse >= 0.3.0", From 68a1112cccf5f0bb6e9fa946161b3704ec460109 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 20 Jul 2021 14:17:34 -0400 Subject: [PATCH 2/3] chore: add comment on embargo of '>= 2.x' min versions Per: https://github.com/googleapis/google-cloud-python/issues/10566 --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index 998cf08d67..f8fb9e93bc 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,13 @@ # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 5 - Production/Stable" dependencies = [ + # NOTE: Maintainers, please do not require google-api-core>=2.x.x + # Until this issue is closed + # https://github.com/googleapis/google-cloud-python/issues/10566 "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + # NOTE: Maintainers, please do not require google-cloud-core>=2.x.x + # Until this issue is closed + # https://github.com/googleapis/google-cloud-python/issues/10566 "google-cloud-core >= 1.4.1, < 3.0dev", "grpc-google-iam-v1 >= 0.12.3, < 0.13dev", "proto-plus >= 1.11.0", From 04ed999b60c8e503188177c73e7e41fba2055f62 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 20 Jul 2021 14:32:26 -0400 Subject: [PATCH 3/3] test: harden 'sample_instance' fixture against 429 --- samples/samples/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/samples/conftest.py b/samples/samples/conftest.py index 8ac8fd53d0..05c94f254f 100644 --- a/samples/samples/conftest.py +++ b/samples/samples/conftest.py @@ -16,6 +16,7 @@ import time import uuid +from google.api_core import exceptions from google.cloud.spanner_v1 import backup from google.cloud.spanner_v1 import client from google.cloud.spanner_v1 import database @@ -90,7 +91,8 @@ def sample_instance( "created": str(int(time.time())) }, ) - op = sample_instance.create() + retry_429 = retry.RetryErrors(exceptions.ResourceExhausted, delay=15) + op = retry_429(sample_instance.create)() op.result(120) # block until completion # Eventual consistency check