Skip to content

fix(deps): pin 'google-{api,cloud}-core' to allow 2.x versions #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 5 commits into from
Jul 20, 2021
Merged

fix(deps): pin 'google-{api,cloud}-core' to allow 2.x versions #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbae221
chore: pin 'google-{api,cloud}-core' to allow 2.x versions
tseaver Jul 15, 2021
da73e73
Merge branch 'master' into pin-allowing-py3-only-cloud-core
tseaver Jul 19, 2021
c7e7b63
Merge branch 'master' into pin-allowing-py3-only-cloud-core
tseaver Jul 20, 2021
68a1112
chore: add comment on embargo of '>= 2.x' min versions
tseaver Jul 20, 2021
04ed999
test: harden 'sample_instance' fixture against 429
tseaver Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion samples/samples/conftest.py
View file
Open in desktop
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
View file
Open in desktop
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