Skip to content

Commit

Permalink
fix(deps): pin 'google-{api,cloud}-core' to allow 2.x versions (#415)
Browse files Browse the repository at this point in the history
Include comment on embargo of '>= 2.x' min versions

Per: googleapis/google-cloud-python#10566
  • Loading branch information
tseaver authored Jul 20, 2021
1 parent fc1bc56 commit b0455d0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion samples/samples/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@
# '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",
# 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",
"sqlparse >= 0.3.0",
Expand Down

0 comments on commit b0455d0

Please sign in to comment.