Removing googleapis-common-protos from deps in non-core packages. (#4098)

* Removing `googleapis-common-protos` from deps in non-`core` packages.

Also

- removing `grpcio` from non-`core` packages.
- manually specifying the `grpcio` dep in core (rather than getting
  it from `googleapis-common-protos[grpc]`)

* Making `grpc` an extra for `core`.

* Adding `googleapis-common-protos` back to `videointelligence`.

Author: dhermes

core/setup.py

@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
+    'googleapis-common-protos >= 1.5.3, < 2.0dev',
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
     'requests >= 2.18.0, < 3.0.0dev',
@@ -61,6 +61,7 @@
 
 EXTRAS_REQUIREMENTS = {
     ':python_version<"3.2"': ['futures >= 3.0.0'],
+    'grpc': ['grpcio >= 1.2.0, < 1.6dev'],
 }
 
 setup(

language/setup.py

@@ -51,9 +51,8 @@
 
 
 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',
-    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],

logging/setup.py

@@ -51,8 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
-    'grpcio >= 1.2.0, < 1.6dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
     'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 

pubsub/setup.py

@@ -51,11 +51,9 @@
 
 
 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',
-    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
     'grpc-google-iam-v1 >= 0.11.1, < 0.12dev',
-    'grpcio >= 1.2.0, < 1.6dev',
     'psutil >= 5.2.2, < 6.0dev',
 ]
 

spanner/setup.py

@@ -52,9 +52,8 @@
 
 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',
-    'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
     'grpc-google-iam-v1>=0.11.4, <0.12dev',
     'requests>=2.18.4, <3.0dev',
 ]

speech/setup.py

@@ -52,9 +52,8 @@
 }
 
 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',
-    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 
 setup(

trace/setup.py

@@ -9,8 +9,7 @@
 
 install_requires = [
     'google-gax>=0.15.7, <0.16dev',
-    'googleapis-common-protos[grpc]>=1.5.3, <2.0dev',
-    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-cloud-core[grpc] >= 0.27.1, < 0.28dev',
 ]
 
 setup(

videointelligence/setup.py

@@ -40,6 +40,7 @@
     install_requires=(
         'googleapis-common-protos >= 1.5.3, < 2.0dev',
         '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',

vision/setup.py

@@ -25,9 +25,8 @@
     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',
-    'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],