Avoiding grpcio==1.6.0 in deps. (googleapis#4096)

dhermes · web-flow · commit d8bb46066887 · 2017-10-02T10:15:57.000-07:00
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: grpc/grpc#12455
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'],

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`REQUIREMENTS = [`
`54`	`54`	`'google-cloud-core >= 0.27.0, < 0.28dev',`
`55`	`55`	`'google-gax >= 0.15.14, < 0.16dev',`
`56`		`- 'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',`
	`56`	`+ 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',`
`57`	`57`	`]`
`58`	`58`	`EXTRAS_REQUIRE = {`
`59`	`59`	`':python_version<"3.4"': ['enum34'],`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`
`53`	`53`	`REQUIREMENTS = [`
`54`	`54`	`'google-cloud-core >= 0.27.0, < 0.28dev',`
`55`		`- 'grpcio >= 1.2.0, < 2.0dev',`
	`55`	`+ 'grpcio >= 1.2.0, < 1.6dev',`
`56`	`56`	`'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',`
`57`	`57`	`]`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`'google-auth >= 1.1.0',`
`55`	`55`	`'google-cloud-core >= 0.27.0, < 0.28dev',`
`56`	`56`	`'google-gax>=0.15.15, <0.16dev',`
`57`		`- 'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',`
	`57`	`+ 'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',`
`58`	`58`	`'grpc-google-iam-v1>=0.11.4, <0.12dev',`
`59`	`59`	`'requests>=2.18.4, <3.0dev',`
`60`	`60`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`install_requires = [`
`11`	`11`	`'google-gax>=0.15.7, <0.16dev',`
`12`		`- 'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',`
	`12`	`+ 'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',`
`13`	`13`	`'google-cloud-core >= 0.27.0, < 0.28dev',`
`14`	`14`	`]`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`REQUIREMENTS = [`
`28`	`28`	`'google-cloud-core >= 0.27.0, < 0.28dev',`
`29`	`29`	`'google-gax >= 0.15.14, < 0.16dev',`
`30`		`- 'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',`
	`30`	`+ 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',`
`31`	`31`	`]`
`32`	`32`	`EXTRAS_REQUIRE = {`
`33`	`33`	`':python_version<"3.4"': ['enum34'],`