Making grpc an extra for core.

dhermes · dhermes · commit 60a17988c0b4 · 2017-10-03T16:38:01.000-07:00
diff --git a/core/setup.py b/core/setup.py
@@ -52,7 +52,6 @@
 
 REQUIREMENTS = [
     'googleapis-common-protos >= 1.5.3, < 2.0dev',
-    'grpcio >= 1.2.0, < 1.6dev',
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
     'requests >= 2.18.0, < 3.0.0dev',
@@ -62,6 +61,7 @@
 
 EXTRAS_REQUIREMENTS = {
     ':python_version<"3.2"': ['futures >= 3.0.0'],
+    'grpc': ['grpcio >= 1.2.0, < 1.6dev'],
 }
 
 setup(
diff --git a/language/setup.py b/language/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
 ]
 EXTRAS_REQUIRE = {
diff --git a/logging/setup.py b/logging/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 
diff --git a/pubsub/setup.py b/pubsub/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     '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/spanner/setup.py b/spanner/setup.py
@@ -52,7 +52,7 @@
 
 REQUIREMENTS = [
     'google-auth >= 1.1.0',
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     '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
@@ -52,7 +52,7 @@
 }
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
 ]
 
diff --git a/trace/setup.py b/trace/setup.py
@@ -9,7 +9,7 @@
 
 install_requires = [
     'google-gax>=0.15.7, <0.16dev',
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
 ]
 
 setup(
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
@@ -39,6 +39,7 @@
     packages=find_packages(exclude=('tests*',)),
     install_requires=(
         'google-gax >= 0.15.14, < 0.16dev',
+        'grpcio >= 1.2.0, < 1.6dev',
         'six >= 1.10.0',
     ),
     url='https://github.com/GoogleCloudPlatform/google-cloud-python',
diff --git a/vision/setup.py b/vision/setup.py
@@ -25,7 +25,7 @@
     readme = readme_file.read()
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     'google-gax >= 0.15.14, < 0.16dev',
 ]
 EXTRAS_REQUIRE = {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`
`52`	`52`
`53`	`53`	`REQUIREMENTS = [`
`54`		`- 'google-cloud-core >= 0.27.0, < 0.28dev',`
	`54`	`+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',`
`55`	`55`	`'google-gax >= 0.15.14, < 0.16dev',`
`56`	`56`	`]`
`57`	`57`	`EXTRAS_REQUIRE = {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`REQUIREMENTS = [`
`55`		`- 'google-cloud-core >= 0.27.0, < 0.28dev',`
	`55`	`+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',`
`56`	`56`	`'google-gax >= 0.15.14, < 0.16dev',`
`57`	`57`	`]`
`58`	`58`
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`		`- 'google-cloud-core >= 0.27.0, < 0.28dev',`
	`12`	`+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',`
`13`	`13`	`]`
`14`	`14`
`15`	`15`	`setup(`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`readme = readme_file.read()`
`26`	`26`
`27`	`27`	`REQUIREMENTS = [`
`28`		`- 'google-cloud-core >= 0.27.0, < 0.28dev',`
	`28`	`+ 'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',`
`29`	`29`	`'google-gax >= 0.15.14, < 0.16dev',`
`30`	`30`	`]`
`31`	`31`	`EXTRAS_REQUIRE = {`