Skip to content

Commit b0455d0

Browse files
authored
fix(deps): pin 'google-{api,cloud}-core' to allow 2.x versions (#415)
Include comment on embargo of '>= 2.x' min versions Per: googleapis/google-cloud-python#10566
1 parent fc1bc56 commit b0455d0

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

samples/samples/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import time
1717
import uuid
1818

19+
from google.api_core import exceptions
1920
from google.cloud.spanner_v1 import backup
2021
from google.cloud.spanner_v1 import client
2122
from google.cloud.spanner_v1 import database
@@ -90,7 +91,8 @@ def sample_instance(
9091
"created": str(int(time.time()))
9192
},
9293
)
93-
op = sample_instance.create()
94+
retry_429 = retry.RetryErrors(exceptions.ResourceExhausted, delay=15)
95+
op = retry_429(sample_instance.create)()
9496
op.result(120) # block until completion
9597

9698
# Eventual consistency check

setup.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@
2929
# 'Development Status :: 5 - Production/Stable'
3030
release_status = "Development Status :: 5 - Production/Stable"
3131
dependencies = [
32-
"google-api-core[grpc] >= 1.26.0, <2.0.0dev",
33-
"google-cloud-core >= 1.4.1, < 2.0dev",
32+
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
33+
# Until this issue is closed
34+
# https://github.com/googleapis/google-cloud-python/issues/10566
35+
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
36+
# NOTE: Maintainers, please do not require google-cloud-core>=2.x.x
37+
# Until this issue is closed
38+
# https://github.com/googleapis/google-cloud-python/issues/10566
39+
"google-cloud-core >= 1.4.1, < 3.0dev",
3440
"grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
3541
"proto-plus >= 1.11.0",
3642
"sqlparse >= 0.3.0",

0 commit comments

Comments
 (0)