From e4c6e63c2fcc848a038808f3a6c3391a534764d3 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 8 Dec 2016 15:17:03 -0800 Subject: [PATCH 1/3] Update versions for mega-release. We want to update - `google-cloud-bigquery` - `google-cloud-datastore` - `google-cloud-logging` - `google-cloud-storage` - `google-cloud-core` And then update `google-cloud` to re-wrap the latest versions of each. However, to avoid having packages in `google-cloud` with conflicting versions of `google-cloud-core`, we must release all packages. --- bigquery/setup.py | 2 +- bigtable/setup.py | 4 ++-- core/setup.py | 2 +- datastore/setup.py | 4 ++-- dns/setup.py | 4 ++-- error_reporting/setup.py | 6 +++--- language/setup.py | 2 +- logging/setup.py | 4 ++-- monitoring/setup.py | 4 ++-- pubsub/setup.py | 4 ++-- resource_manager/setup.py | 4 ++-- runtimeconfig/setup.py | 4 ++-- setup.py | 34 +++++++++++++++++----------------- speech/setup.py | 4 ++-- storage/setup.py | 4 ++-- translate/setup.py | 4 ++-- vision/setup.py | 4 ++-- 17 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bigquery/setup.py b/bigquery/setup.py index c3102d15401d..acb2a03bb322 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.22.0, < 0.23dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( diff --git a/bigtable/setup.py b/bigtable/setup.py index a5e7387ac813..36a9ac76eff8 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', 'grpcio >= 1.0.0, < 2.0dev', ] setup( name='google-cloud-bigtable', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Bigtable', long_description=README, namespace_packages=[ diff --git a/core/setup.py b/core/setup.py index 550e2069f305..4e19fcd13678 100644 --- a/core/setup.py +++ b/core/setup.py @@ -60,7 +60,7 @@ setup( name='google-cloud-core', - version='0.22.0', + version='0.22.1', description='API Client library for Google Cloud: Core Helpers', long_description=README, namespace_packages=[ diff --git a/datastore/setup.py b/datastore/setup.py index e79548d09a58..a0ca9a2f5606 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', 'grpcio >= 1.0.0, < 2.0dev', ] setup( name='google-cloud-datastore', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Datastore', long_description=README, namespace_packages=[ diff --git a/dns/setup.py b/dns/setup.py index a66924a04700..236361f6b721 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-dns', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud DNS', long_description=README, namespace_packages=[ diff --git a/error_reporting/setup.py b/error_reporting/setup.py index a3e646f1b917..9d65198d9af6 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', - 'google-cloud-logging >= 0.21.0', + 'google-cloud-core >= 0.22.1, < 0.23dev', + 'google-cloud-logging >= 0.22.0, < 0.23dev', ] setup( name='google-cloud-error-reporting', - version='0.21.0', + version='0.22.0', description='Python Client for Stackdriver Error Reporting', long_description=README, namespace_packages=[ diff --git a/language/setup.py b/language/setup.py index 2f4fc4020986..2c6cb62b3891 100644 --- a/language/setup.py +++ b/language/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.22.0, < 0.23dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( diff --git a/logging/setup.py b/logging/setup.py index 03b7563ec730..00cd3d5f94f0 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', 'gapic-google-cloud-logging-v2 >= 0.14.0, < 0.15dev', ] setup( name='google-cloud-logging', - version='0.21.0', + version='0.22.0', description='Python Client for Stackdriver Logging', long_description=README, namespace_packages=[ diff --git a/monitoring/setup.py b/monitoring/setup.py index c33132b848c2..f20378bc45b1 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-monitoring', - version='0.21.0', + version='0.22.0', description='Python Client for Stackdriver Monitoring', long_description=README, namespace_packages=[ diff --git a/pubsub/setup.py b/pubsub/setup.py index 37d9cb9d6496..2923526312a4 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', 'gapic-google-cloud-pubsub-v1 >= 0.14.0, < 0.15dev', ] setup( name='google-cloud-pubsub', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Pub/Sub', long_description=README, namespace_packages=[ diff --git a/resource_manager/setup.py b/resource_manager/setup.py index 6f2b838261c0..66ffd9ccd2cc 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-resource-manager', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Resource Manager', long_description=README, namespace_packages=[ diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py index 410fe433be7a..37fe51eef504 100644 --- a/runtimeconfig/setup.py +++ b/runtimeconfig/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-runtimeconfig', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud RuntimeConfig', long_description=README, namespace_packages=[ diff --git a/setup.py b/setup.py index 5e5951cd6bf8..1a09a94c5b18 100644 --- a/setup.py +++ b/setup.py @@ -50,27 +50,27 @@ REQUIREMENTS = [ - 'google-cloud-bigquery >= 0.21.0, < 0.22dev', - 'google-cloud-bigtable >= 0.21.0, < 0.22dev', - 'google-cloud-happybase >= 0.21.0, < 0.22dev', - 'google-cloud-core >= 0.21.0, < 0.22dev', - 'google-cloud-datastore >= 0.21.0, < 0.22dev', - 'google-cloud-dns >= 0.21.0, < 0.22dev', - 'google-cloud-error-reporting >= 0.21.0, < 0.22dev', - 'google-cloud-language >= 0.21.0, < 0.22dev', - 'google-cloud-logging >= 0.21.0, < 0.22dev', - 'google-cloud-monitoring >= 0.21.0, < 0.22dev', - 'google-cloud-pubsub >= 0.21.0, < 0.22dev', - 'google-cloud-resource-manager >= 0.21.0, < 0.22dev', - 'google-cloud-storage >= 0.21.0, < 0.22dev', - 'google-cloud-translate >= 0.21.0, < 0.22dev', - 'google-cloud-vision >= 0.21.0, < 0.22dev', - 'google-cloud-runtimeconfig >= 0.21.0, < 0.22dev', + 'google-cloud-bigquery >= 0.22.0, < 0.23dev', + 'google-cloud-bigtable >= 0.22.0, < 0.23dev', + 'google-cloud-happybase >= 0.22.0, < 0.23dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', + 'google-cloud-datastore >= 0.22.0, < 0.23dev', + 'google-cloud-dns >= 0.22.0, < 0.23dev', + 'google-cloud-error-reporting >= 0.22.0, < 0.23dev', + 'google-cloud-language >= 0.22.0, < 0.23dev', + 'google-cloud-logging >= 0.22.0, < 0.23dev', + 'google-cloud-monitoring >= 0.22.0, < 0.23dev', + 'google-cloud-pubsub >= 0.22.0, < 0.23dev', + 'google-cloud-resource-manager >= 0.22.0, < 0.23dev', + 'google-cloud-storage >= 0.22.0, < 0.23dev', + 'google-cloud-translate >= 0.22.0, < 0.23dev', + 'google-cloud-vision >= 0.22.0, < 0.23dev', + 'google-cloud-runtimeconfig >= 0.22.0, < 0.23dev', ] setup( name='google-cloud', - version='0.21.1', + version='0.22.0', description='API Client library for Google Cloud', long_description=README, install_requires=REQUIREMENTS, diff --git a/speech/setup.py b/speech/setup.py index 5b8254826496..038f600d88d5 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -49,13 +49,13 @@ } REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0', + 'google-cloud-core >= 0.22.1, < 0.23dev', 'gapic-google-cloud-speech-v1beta1 >= 0.14.0, < 0.15dev', ] setup( name='google-cloud-speech', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Speech', long_description=README, namespace_packages=[ diff --git a/storage/setup.py b/storage/setup.py index adc96a1d2c50..63ac393e4c20 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-storage', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Storage', long_description=README, namespace_packages=[ diff --git a/translate/setup.py b/translate/setup.py index 63ce5117f12a..68351f553edb 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-translate', - version='0.21.0', + version='0.22.0', description='Python Client for Google Translate', long_description=README, namespace_packages=[ diff --git a/vision/setup.py b/vision/setup.py index e5125b8cc4e8..9d193b30c1b0 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -51,12 +51,12 @@ REQUIREMENTS = [ 'enum34', - 'google-cloud-core >= 0.21.0, < 0.22dev', + 'google-cloud-core >= 0.22.1, < 0.23dev', ] setup( name='google-cloud-vision', - version='0.21.0', + version='0.22.0', description='Python Client for Google Cloud Vision', long_description=README, namespace_packages=[ From fafc4e500b5aeb95a266605887fe8913aececf3a Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 8 Dec 2016 15:44:04 -0800 Subject: [PATCH 2/3] Making sub-minor updates to libraries already on 0.22.x --- bigquery/setup.py | 2 +- language/setup.py | 2 +- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigquery/setup.py b/bigquery/setup.py index acb2a03bb322..98aea8dbe15b 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -55,7 +55,7 @@ setup( name='google-cloud-bigquery', - version='0.22.0', + version='0.22.1', description='Python Client for Google BigQuery', long_description=README, namespace_packages=[ diff --git a/language/setup.py b/language/setup.py index 2c6cb62b3891..22538aebdeb9 100644 --- a/language/setup.py +++ b/language/setup.py @@ -55,7 +55,7 @@ setup( name='google-cloud-language', - version='0.22.0', + version='0.22.1', description='Python Client for Google Cloud Natural Language', long_description=README, namespace_packages=[ diff --git a/setup.py b/setup.py index 1a09a94c5b18..e5a926e80a11 100644 --- a/setup.py +++ b/setup.py @@ -50,14 +50,14 @@ REQUIREMENTS = [ - 'google-cloud-bigquery >= 0.22.0, < 0.23dev', + 'google-cloud-bigquery >= 0.22.1, < 0.23dev', 'google-cloud-bigtable >= 0.22.0, < 0.23dev', 'google-cloud-happybase >= 0.22.0, < 0.23dev', 'google-cloud-core >= 0.22.1, < 0.23dev', 'google-cloud-datastore >= 0.22.0, < 0.23dev', 'google-cloud-dns >= 0.22.0, < 0.23dev', 'google-cloud-error-reporting >= 0.22.0, < 0.23dev', - 'google-cloud-language >= 0.22.0, < 0.23dev', + 'google-cloud-language >= 0.22.1, < 0.23dev', 'google-cloud-logging >= 0.22.0, < 0.23dev', 'google-cloud-monitoring >= 0.22.0, < 0.23dev', 'google-cloud-pubsub >= 0.22.0, < 0.23dev', From af5cc494cbd86df6490832b923ada19ebb612272 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Fri, 9 Dec 2016 16:57:17 -0800 Subject: [PATCH 3/3] Explicitly putting 1.0.2 lower bound on grpcio. Also upgrading logging from 0.14.x to 0.90.x --- bigtable/setup.py | 2 +- core/tox.ini | 2 +- datastore/setup.py | 2 +- logging/setup.py | 3 ++- pubsub/setup.py | 1 + speech/setup.py | 1 + 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bigtable/setup.py b/bigtable/setup.py index 36a9ac76eff8..08cd2eb7d6b4 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.22.1, < 0.23dev', - 'grpcio >= 1.0.0, < 2.0dev', + 'grpcio >= 1.0.2, < 2.0dev', ] setup( diff --git a/core/tox.ini b/core/tox.ini index 3f9dc5ae4218..48e8a517f057 100644 --- a/core/tox.ini +++ b/core/tox.ini @@ -4,7 +4,7 @@ envlist = [testing] deps = - grpcio + grpcio >= 1.0.2rc0 mock pytest covercmd = diff --git a/datastore/setup.py b/datastore/setup.py index a0ca9a2f5606..3de3a0b91a84 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.22.1, < 0.23dev', - 'grpcio >= 1.0.0, < 2.0dev', + 'grpcio >= 1.0.2, < 2.0dev', ] setup( diff --git a/logging/setup.py b/logging/setup.py index 00cd3d5f94f0..98645b8ea1e8 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -51,7 +51,8 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.22.1, < 0.23dev', - 'gapic-google-cloud-logging-v2 >= 0.14.0, < 0.15dev', + 'grpcio >= 1.0.2, < 2.0dev', + 'gapic-google-cloud-logging-v2 >= 0.90.0, < 0.91dev', ] setup( diff --git a/pubsub/setup.py b/pubsub/setup.py index 2923526312a4..3d713235e7a8 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -51,6 +51,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.22.1, < 0.23dev', + 'grpcio >= 1.0.2, < 2.0dev', 'gapic-google-cloud-pubsub-v1 >= 0.14.0, < 0.15dev', ] diff --git a/speech/setup.py b/speech/setup.py index 038f600d88d5..eb10b0e7dff2 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -50,6 +50,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.22.1, < 0.23dev', + 'grpcio >= 1.0.2, < 2.0dev', 'gapic-google-cloud-speech-v1beta1 >= 0.14.0, < 0.15dev', ]