From cb99f8e50dca505fe98bedf31209ab3211adefac Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 2 Oct 2017 09:44:12 -0700
Subject: [PATCH] Avoiding `grpcio==1.6.0` in deps.

This is due to `google-gax` doing the same, which has broken
RTD builds:

https://readthedocs.org/projects/google-cloud-python/builds/6063446/

The motivation for avoiding `grpcio==1.6.0` is:

https://github.com/grpc/grpc/issues/12455
---
 core/setup.py              | 2 +-
 language/setup.py          | 2 +-
 logging/setup.py           | 2 +-
 pubsub/setup.py            | 4 ++--
 spanner/setup.py           | 2 +-
 speech/setup.py            | 2 +-
 trace/setup.py             | 2 +-
 videointelligence/setup.py | 2 +-
 vision/setup.py            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/setup.py b/core/setup.py
index 438616260ed9..bae751123e3c 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'googleapis-common-protos >= 1.3.4',
+    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
     'requests >= 2.18.0, < 3.0.0dev',
diff --git a/language/setup.py b/language/setup.py
index 97e8b9dd4d5b..7036b689222d 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -53,7 +53,7 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.27.0, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
-    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
+    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],
diff --git a/logging/setup.py b/logging/setup.py
index 98cca4b3ebec..c211b10f7fc0 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -52,7 +52,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.27.0, < 0.28dev',
-    'grpcio >= 1.2.0, < 2.0dev',
+    'grpcio >= 1.2.0, < 1.6dev',
     'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 
diff --git a/pubsub/setup.py b/pubsub/setup.py
index 5316b5363469..35235ba30cc6 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -53,9 +53,9 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.27.0, < 0.28dev',
     'google-gax >= 0.15.13, < 0.16dev',
-    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
+    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
     'grpc-google-iam-v1 >= 0.11.1, < 0.12dev',
-    'grpcio >= 1.0.2, < 2.0dev',
+    'grpcio >= 1.2.0, < 1.6dev',
     'psutil >= 5.2.2, < 6.0dev',
 ]
 
diff --git a/spanner/setup.py b/spanner/setup.py
index 091cf05d8741..588bb3f0ad59 100644
--- a/spanner/setup.py
+++ b/spanner/setup.py
@@ -54,7 +54,7 @@
     'google-auth >= 1.1.0',
     'google-cloud-core >= 0.27.0, < 0.28dev',
     'google-gax>=0.15.15, <0.16dev',
-    'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',
+    'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
     '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 7111cee303e2..a3c86d241a29 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -54,7 +54,7 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.27.0, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
-    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
+    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 
 setup(
diff --git a/trace/setup.py b/trace/setup.py
index 8072778bba4b..b646766e2d20 100644
--- a/trace/setup.py
+++ b/trace/setup.py
@@ -9,7 +9,7 @@
 
 install_requires = [
     'google-gax>=0.15.7, <0.16dev',
-    'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',
+    'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
     'google-cloud-core >= 0.27.0, < 0.28dev',
 ]
 
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
index 4cb241cfd085..61c4a30b2d98 100644
--- a/videointelligence/setup.py
+++ b/videointelligence/setup.py
@@ -38,7 +38,7 @@
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=(
-        'googleapis-common-protos >= 1.5.2, < 2.0dev',
+        'googleapis-common-protos >= 1.5.3, < 2.0dev',
         'google-gax >= 0.15.14, < 0.16dev',
         'six >= 1.10.0',
     ),
diff --git a/vision/setup.py b/vision/setup.py
index b5d6d5a4404d..b29c32fe5ec5 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -27,7 +27,7 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.27.0, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
-    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
+    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],