From d2fc2c2f140dc8a5a0167ce201ebf589fac8d171 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 14 Nov 2016 12:44:19 -0800 Subject: [PATCH 1/2] Upgrading core to version to 0.21.0. As a result, also upgrading the umbrella package and all packages to 0.21.0 (since they all depend on core). --- bigquery/setup.py | 4 ++-- bigtable/setup.py | 4 ++-- core/setup.py | 2 +- datastore/setup.py | 4 ++-- dns/setup.py | 4 ++-- error_reporting/setup.py | 6 +++--- language/setup.py | 4 ++-- logging/setup.py | 4 ++-- monitoring/setup.py | 4 ++-- pubsub/setup.py | 4 ++-- resource_manager/setup.py | 4 ++-- runtimeconfig/setup.py | 4 ++-- setup.py | 32 ++++++++++++++++---------------- speech/setup.py | 4 ++-- storage/setup.py | 4 ++-- translate/setup.py | 4 ++-- vision/setup.py | 4 ++-- 17 files changed, 48 insertions(+), 48 deletions(-) diff --git a/bigquery/setup.py b/bigquery/setup.py index a54bfd655f48..82a9e42d3458 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-bigquery', - version='0.20.0', + version='0.21.0', description='Python Client for Google BigQuery', long_description=README, namespace_packages=[ diff --git a/bigtable/setup.py b/bigtable/setup.py index 6c36042e9484..2f4fe451fb28 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', 'grpcio >= 1.0.0, < 2.0dev', ] setup( name='google-cloud-bigtable', - version='0.20.0', + version='0.21.0', description='Python Client for Google Cloud Bigtable', long_description=README, namespace_packages=[ diff --git a/core/setup.py b/core/setup.py index b59d4f5d2b3c..5d2f0d1fef7f 100644 --- a/core/setup.py +++ b/core/setup.py @@ -59,7 +59,7 @@ setup( name='google-cloud-core', - version='0.20.0', + version='0.21.0', 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 d79db705950a..b1884e3c69eb 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', 'grpcio >= 1.0.0, < 2.0dev', ] setup( name='google-cloud-datastore', - version='0.20.1', + version='0.21.0', description='Python Client for Google Cloud Datastore', long_description=README, namespace_packages=[ diff --git a/dns/setup.py b/dns/setup.py index ca6107dae1a8..fd3360e80828 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-dns', - version='0.20.0', + version='0.21.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 6b98eb55cf19..44024cf4b059 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', - 'google-cloud-logging >= 0.20.0', + 'google-cloud-core >= 0.21.0', + 'google-cloud-logging >= 0.21.0', ] setup( name='google-cloud-error-reporting', - version='0.20.0', + version='0.21.0', description='Python Client for Stackdriver Error Reporting', long_description=README, namespace_packages=[ diff --git a/language/setup.py b/language/setup.py index 7e3907123362..49ca5d60e788 100644 --- a/language/setup.py +++ b/language/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-language', - version='0.20.0', + version='0.21.0', description='Python Client for Google Cloud Natural Language', long_description=README, namespace_packages=[ diff --git a/logging/setup.py b/logging/setup.py index 0a0255553e24..6ab0c59b6ca0 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', 'grpcio >= 1.0.0, < 2.0dev', 'google-gax >= 0.14.1, < 0.15dev', 'gapic-google-logging-v2 >= 0.10.1, < 0.11dev', @@ -59,7 +59,7 @@ setup( name='google-cloud-logging', - version='0.20.0', + version='0.21.0', description='Python Client for Stackdriver Logging', long_description=README, namespace_packages=[ diff --git a/monitoring/setup.py b/monitoring/setup.py index 0fcbbc379d02..44f14e2c1327 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-monitoring', - version='0.20.0', + version='0.21.0', description='Python Client for Stackdriver Monitoring', long_description=README, namespace_packages=[ diff --git a/pubsub/setup.py b/pubsub/setup.py index 6accc0ae8138..eb6b58cb86a0 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', 'grpcio >= 1.0.0, < 2.0dev', 'google-gax >= 0.14.1, < 0.15dev', 'gapic-google-pubsub-v1 >= 0.10.1, < 0.11dev', @@ -59,7 +59,7 @@ setup( name='google-cloud-pubsub', - version='0.20.0', + version='0.21.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 063b4dcbd16f..0bc3e55ec04e 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-resource-manager', - version='0.20.0', + version='0.21.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 9544638481c5..86abf32de4be 100644 --- a/runtimeconfig/setup.py +++ b/runtimeconfig/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-runtimeconfig', - version='0.20.0', + version='0.21.0', description='Python Client for Google Cloud RuntimeConfig', long_description=README, namespace_packages=[ diff --git a/setup.py b/setup.py index 0b140900d9b7..372fdfe0dc55 100644 --- a/setup.py +++ b/setup.py @@ -50,27 +50,27 @@ REQUIREMENTS = [ - 'google-cloud-bigquery >= 0.20.0', - 'google-cloud-bigtable >= 0.20.0', + 'google-cloud-bigquery >= 0.21.0', + 'google-cloud-bigtable >= 0.21.0', 'google-cloud-happybase >= 0.20.0', - 'google-cloud-core >= 0.20.0', - 'google-cloud-datastore >= 0.20.0', - 'google-cloud-dns >= 0.20.0', - 'google-cloud-error-reporting >= 0.20.0', - 'google-cloud-language >= 0.20.0', - 'google-cloud-logging >= 0.20.0', - 'google-cloud-monitoring >= 0.20.0', - 'google-cloud-pubsub >= 0.20.0', - 'google-cloud-resource-manager >= 0.20.0', - 'google-cloud-storage >= 0.20.0', - 'google-cloud-translate >= 0.20.0', - 'google-cloud-vision >= 0.20.0', - 'google-cloud-runtimeconfig >= 0.20.0', + 'google-cloud-core >= 0.21.0', + 'google-cloud-datastore >= 0.21.0', + 'google-cloud-dns >= 0.21.0', + 'google-cloud-error-reporting >= 0.21.0', + 'google-cloud-language >= 0.21.0', + 'google-cloud-logging >= 0.21.0', + 'google-cloud-monitoring >= 0.21.0', + 'google-cloud-pubsub >= 0.21.0', + 'google-cloud-resource-manager >= 0.21.0', + 'google-cloud-storage >= 0.21.0', + 'google-cloud-translate >= 0.21.0', + 'google-cloud-vision >= 0.21.0', + 'google-cloud-runtimeconfig >= 0.21.0', ] setup( name='google-cloud', - version='0.20.0', + version='0.21.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 cd56983412da..29cd8f18e0d0 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', 'gapic-google-cloud-speech-v1beta1 >= 0.11.1, < 0.12.0', ] setup( name='google-cloud-speech', - version='0.20.0dev', + version='0.21.0', description='Python Client for Google Cloud Speech', long_description=README, namespace_packages=[ diff --git a/storage/setup.py b/storage/setup.py index 3632105ff6f9..7a877b07b37b 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-storage', - version='0.20.0', + version='0.21.0', description='Python Client for Google Cloud Storage', long_description=README, namespace_packages=[ diff --git a/translate/setup.py b/translate/setup.py index c135b122e920..8245c14cc00c 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-translate', - version='0.20.0', + version='0.21.0', description='Python Client for Google Translate', long_description=README, namespace_packages=[ diff --git a/vision/setup.py b/vision/setup.py index 59e8cec8c67f..29e83cc6cf64 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.20.0', + 'google-cloud-core >= 0.21.0', ] setup( name='google-cloud-vision', - version='0.20.0', + version='0.21.0', description='Python Client for Google Cloud Vision', long_description=README, namespace_packages=[ From a12ab98bb5a5bf613916a829a37b5c5c9a568a3f Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 14 Nov 2016 14:11:34 -0800 Subject: [PATCH 2/2] Need to install from local deps first. The `pip install --upgrade` still is needed to ensure freshness but by removing the filesystem paths from deps we made the initial install grab from PyPI (by mistake). This way, all local package deps are grabbed from the local filesystem. --- bigquery/tox.ini | 5 ++--- bigtable/tox.ini | 3 +-- datastore/tox.ini | 5 ++--- dns/tox.ini | 3 +-- error_reporting/tox.ini | 4 ++-- language/tox.ini | 3 +-- logging/tox.ini | 5 ++--- monitoring/tox.ini | 3 +-- pubsub/tox.ini | 5 ++--- resource_manager/tox.ini | 3 +-- runtimeconfig/tox.ini | 3 +-- speech/tox.ini | 3 +-- storage/tox.ini | 5 ++--- translate/tox.ini | 3 +-- vision/tox.ini | 3 +-- 15 files changed, 21 insertions(+), 35 deletions(-) diff --git a/bigquery/tox.ini b/bigquery/tox.ini index 2966a8546dec..51d238d48c1c 100644 --- a/bigquery/tox.ini +++ b/bigquery/tox.ini @@ -6,8 +6,9 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = - pytest + {toxinidir}/../core mock + pytest covercmd = py.test --quiet \ --cov=google.cloud.bigquery \ @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/bigtable/tox.ini b/bigtable/tox.ini index 36f5e1d2a950..94006dd1c3ad 100644 --- a/bigtable/tox.ini +++ b/bigtable/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/datastore/tox.ini b/datastore/tox.ini index 22efa3321840..0209be892cdf 100644 --- a/datastore/tox.ini +++ b/datastore/tox.ini @@ -6,8 +6,9 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = - pytest + {toxinidir}/../core mock + pytest covercmd = py.test --quiet \ --cov=google.cloud.datastore \ @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/dns/tox.ini b/dns/tox.ini index 24f5e68c23cb..a783fb8fd8ed 100644 --- a/dns/tox.ini +++ b/dns/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/error_reporting/tox.ini b/error_reporting/tox.ini index 631fb8930ea2..d589a736faa9 100644 --- a/error_reporting/tox.ini +++ b/error_reporting/tox.ini @@ -8,6 +8,8 @@ localdeps = {toxinidir}/../core \ {toxinidir}/../logging deps = + {toxinidir}/../core + {toxinidir}/../logging pytest covercmd = py.test --quiet \ @@ -18,7 +20,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -27,7 +28,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/language/tox.ini b/language/tox.ini index fba072feb365..98aa5a0b8f4a 100644 --- a/language/tox.ini +++ b/language/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/logging/tox.ini b/logging/tox.ini index dd8c14186e5b..ea41e5413c43 100644 --- a/logging/tox.ini +++ b/logging/tox.ini @@ -6,8 +6,9 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = - pytest + {toxinidir}/../core mock + pytest covercmd = py.test --quiet \ --cov=google.cloud.logging \ @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/monitoring/tox.ini b/monitoring/tox.ini index d825482792cd..ecc2529aa96a 100644 --- a/monitoring/tox.ini +++ b/monitoring/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testing]deps} diff --git a/pubsub/tox.ini b/pubsub/tox.ini index 212ba8f7d619..25e6fae5ea27 100644 --- a/pubsub/tox.ini +++ b/pubsub/tox.ini @@ -6,8 +6,9 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = - pytest + {toxinidir}/../core mock + pytest covercmd = py.test --quiet \ --cov=google.cloud.pubsub \ @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/resource_manager/tox.ini b/resource_manager/tox.ini index 8eb59e9cedab..886922cc4c13 100644 --- a/resource_manager/tox.ini +++ b/resource_manager/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/runtimeconfig/tox.ini b/runtimeconfig/tox.ini index 7596626071ad..c0c03fe81dce 100644 --- a/runtimeconfig/tox.ini +++ b/runtimeconfig/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/speech/tox.ini b/speech/tox.ini index 7725027aea32..d5e3e45339e4 100644 --- a/speech/tox.ini +++ b/speech/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/storage/tox.ini b/storage/tox.ini index 7c87032c5ed4..605d42d6f677 100644 --- a/storage/tox.ini +++ b/storage/tox.ini @@ -6,8 +6,9 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = - pytest + {toxinidir}/../core mock + pytest covercmd = py.test --quiet \ --cov=google.cloud.storage \ @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/translate/tox.ini b/translate/tox.ini index 168559383e71..aaa39a706d93 100644 --- a/translate/tox.ini +++ b/translate/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core mock pytest covercmd = @@ -17,7 +18,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,7 +26,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/vision/tox.ini b/vision/tox.ini index d9e71cf21664..70312f58ff34 100644 --- a/vision/tox.ini +++ b/vision/tox.ini @@ -6,6 +6,7 @@ envlist = localdeps = pip install --quiet --upgrade {toxinidir}/../core deps = + {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -16,7 +17,6 @@ covercmd = [testenv] commands = - {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,7 +25,6 @@ deps = basepython = python2.7 commands = - {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps}