From 6579dcccbb99548cbdd8f14e776e12a482c0b977 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 30 Oct 2017 13:03:27 -0700 Subject: [PATCH 1/5] Cutting version 0.28.0 of `google-cloud-core`. Also updating all dependencies of `grpcio` to `>= 1.7.0`. This was due to an issue [1] with `1.6.0`. [1]: https://github.com/grpc/grpc/issues/12455 --- api_core/setup.py | 2 +- core/setup.py | 4 ++-- videointelligence/setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api_core/setup.py b/api_core/setup.py index fa6cdf70c995..260776611a89 100644 --- a/api_core/setup.py +++ b/api_core/setup.py @@ -60,7 +60,7 @@ EXTRAS_REQUIREMENTS = { ':python_version<"3.2"': ['futures >= 3.0.0'], - 'grpc': ['grpcio >= 1.2.0, < 1.6dev'], + 'grpc': ['grpcio >= 1.7.0'], } setup( diff --git a/core/setup.py b/core/setup.py index 83efbe3a398e..294ced6b5228 100644 --- a/core/setup.py +++ b/core/setup.py @@ -55,12 +55,12 @@ ] EXTRAS_REQUIREMENTS = { - 'grpc': ['grpcio >= 1.2.0, < 1.6dev'], + 'grpc': ['grpcio >= 1.7.0'], } setup( name='google-cloud-core', - version='0.27.1', + version='0.28.0', description='API Client library for Google Cloud: Core Helpers', long_description=README, namespace_packages=[ diff --git a/videointelligence/setup.py b/videointelligence/setup.py index d093dca5631d..0220c79c2da1 100644 --- a/videointelligence/setup.py +++ b/videointelligence/setup.py @@ -40,7 +40,7 @@ install_requires=( 'googleapis-common-protos >= 1.5.3, < 2.0dev', 'google-gax >= 0.15.14, < 0.16dev', - 'grpcio >= 1.2.0, < 1.6dev', + 'grpcio >= 1.7.0', 'six >= 1.10.0', ), url='https://github.com/GoogleCloudPlatform/google-cloud-python', From 1234d1e5c90881ec3c57ce9d9029e4d81d2b454b Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 30 Oct 2017 13:12:42 -0700 Subject: [PATCH 2/5] Also updating the version of `google-api-core`. This is required since the bounds on `grpcio` of `google-cloud-core==0.28.0` and `google-api-core==0.1.0` are (would be) mutually exclusive. --- api_core/setup.py | 2 +- core/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api_core/setup.py b/api_core/setup.py index 260776611a89..d488fa01b7a2 100644 --- a/api_core/setup.py +++ b/api_core/setup.py @@ -65,7 +65,7 @@ setup( name='google-api-core', - version='0.1.0', + version='0.1.1', description='Core Google API Client Library', long_description=README, namespace_packages=['google'], diff --git a/core/setup.py b/core/setup.py index 294ced6b5228..acea6a3ffd20 100644 --- a/core/setup.py +++ b/core/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-api-core >= 0.1.0, < 0.2.0dev', + 'google-api-core >= 0.1.1, < 0.2.0dev', ] EXTRAS_REQUIREMENTS = { From 613f0c5e2fa32f056be2f86b605c975ab68372d0 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 30 Oct 2017 13:17:46 -0700 Subject: [PATCH 3/5] Updating `google-api-core` CHANGELOG for release. --- api_core/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api_core/CHANGELOG.md b/api_core/CHANGELOG.md index ca32b9c39792..cd497b181313 100644 --- a/api_core/CHANGELOG.md +++ b/api_core/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v0.1.1 + +- Upgrading `grpcio` dependency from `1.2.0, < 1.6dev` to `>= 1.7.0` (#4280) + ## v0.1.0 Initial release From 1287e1aba62f3dfd3654eb64794dfa140bcaf47f Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 30 Oct 2017 13:33:20 -0700 Subject: [PATCH 4/5] Updating packages to depend on `google-cloud-core>=0.28.0`. --- bigquery/setup.py | 2 +- bigtable/setup.py | 2 +- datastore/setup.py | 2 +- dns/setup.py | 2 +- error_reporting/setup.py | 2 +- firestore/setup.py | 2 +- language/setup.py | 2 +- logging/setup.py | 2 +- monitoring/setup.py | 2 +- pubsub/setup.py | 2 +- resource_manager/setup.py | 2 +- runtimeconfig/setup.py | 2 +- setup.py | 2 +- spanner/setup.py | 2 +- speech/setup.py | 2 +- storage/setup.py | 2 +- trace/setup.py | 2 +- translate/setup.py | 2 +- vision/setup.py | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bigquery/setup.py b/bigquery/setup.py index ea25589bdc8b..53d79dd87bb1 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-auth >= 1.0.0', 'google-resumable-media >= 0.2.1', 'requests >= 2.18.0', diff --git a/bigtable/setup.py b/bigtable/setup.py index dd9087c60bbf..12d856dfb435 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-gax>=0.15.7, <0.16dev', ] diff --git a/datastore/setup.py b/datastore/setup.py index e8339369b18c..2190bc351b71 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-gax>=0.15.7, <0.16dev', 'gapic-google-cloud-datastore-v1 >= 0.15.0, < 0.16dev', ] diff --git a/dns/setup.py b/dns/setup.py index 3498ea464053..6ca3707a2f07 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] setup( diff --git a/error_reporting/setup.py b/error_reporting/setup.py index 58b9c566e7fc..d8d5d4dc76bf 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-cloud-logging >= 1.3.0, < 1.4dev', 'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev' ] diff --git a/firestore/setup.py b/firestore/setup.py index 4d48ea65f882..ea3a480fb742 100644 --- a/firestore/setup.py +++ b/firestore/setup.py @@ -50,7 +50,7 @@ } REQUIREMENTS = [ - 'google-cloud-core >= 0.27.1, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-gax>=0.15.7, <0.16dev', ] diff --git a/language/setup.py b/language/setup.py index 5cce974399ab..d0fc06afc691 100644 --- a/language/setup.py +++ b/language/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'google-gax >= 0.15.14, < 0.16dev', ] EXTRAS_REQUIRE = { diff --git a/logging/setup.py b/logging/setup.py index 2b11432fd5e8..a757d10b7518 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev', ] diff --git a/monitoring/setup.py b/monitoring/setup.py index 03f8db904d5d..99cb43da0f77 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] setup( diff --git a/pubsub/setup.py b/pubsub/setup.py index 42c98394dd8d..9456a0516a0c 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'google-gax >= 0.15.13, < 0.16dev', 'grpc-google-iam-v1 >= 0.11.1, < 0.12dev', 'psutil >= 5.2.2, < 6.0dev', diff --git a/resource_manager/setup.py b/resource_manager/setup.py index b552897dae80..c563b0e8949e 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] setup( diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py index 2a06eda09128..00992084c723 100644 --- a/runtimeconfig/setup.py +++ b/runtimeconfig/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] setup( diff --git a/setup.py b/setup.py index 002fde5e15b2..421f8a8adc3f 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ 'google-cloud-bigquery >= 0.27.0, < 0.28dev', 'google-cloud-bigtable >= 0.27.0, < 0.28dev', - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-cloud-datastore >= 1.3.0, < 1.4dev', 'google-cloud-dns >= 0.27.0, < 0.28dev', 'google-cloud-error-reporting >= 0.27.0, < 0.28dev', diff --git a/spanner/setup.py b/spanner/setup.py index 24fd0ffa728e..f56a70061dd6 100644 --- a/spanner/setup.py +++ b/spanner/setup.py @@ -52,7 +52,7 @@ REQUIREMENTS = [ 'google-auth >= 1.1.0', - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'google-gax>=0.15.15, <0.16dev', 'grpc-google-iam-v1>=0.11.4, <0.12dev', 'requests>=2.18.4, <3.0dev', diff --git a/speech/setup.py b/speech/setup.py index 8a15fe7b10b2..adb7d37689a7 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -52,7 +52,7 @@ } REQUIREMENTS = [ - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'google-gax >= 0.15.14, < 0.16dev', ] diff --git a/storage/setup.py b/storage/setup.py index a1924cebca56..46187a13fab3 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', 'google-auth >= 1.0.0', 'google-resumable-media >= 0.3.1', 'requests >= 2.18.0', diff --git a/trace/setup.py b/trace/setup.py index c14fbbedc7a8..8b31cf39e328 100644 --- a/trace/setup.py +++ b/trace/setup.py @@ -9,7 +9,7 @@ install_requires = [ 'google-gax>=0.15.7, <0.16dev', - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', ] setup( diff --git a/translate/setup.py b/translate/setup.py index e22f9aa3b14b..32581802721a 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.27.0, < 0.28dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] setup( diff --git a/vision/setup.py b/vision/setup.py index f8834069a7e7..b7ccb024c367 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -25,7 +25,7 @@ readme = readme_file.read() REQUIREMENTS = [ - 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev', + 'google-cloud-core[grpc] >= 0.28.0, < 0.29dev', 'google-gax >= 0.15.14, < 0.16dev', ] EXTRAS_REQUIRE = { From b9a6898eb854946e57df39c70b12ce5d7d85cfc3 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 30 Oct 2017 14:36:34 -0700 Subject: [PATCH 5/5] Installing `nox -s lint` deps locally for vision. --- vision/nox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vision/nox.py b/vision/nox.py index f532dd27262a..7f517eca2c83 100644 --- a/vision/nox.py +++ b/vision/nox.py @@ -117,7 +117,7 @@ def lint(session): serious code quality issues. """ session.interpreter = 'python3.6' - session.install('flake8', 'pylint', 'gcp-devrel-py-tools') + session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS) session.install('.') session.run('flake8', 'google/cloud/vision') session.run(