diff --git a/core/setup.py b/core/setup.py index bae751123e3c..1513eba1832d 100644 --- a/core/setup.py +++ b/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( diff --git a/language/setup.py b/language/setup.py index 7036b689222d..5cce974399ab 100644 --- a/language/setup.py +++ b/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'], diff --git a/logging/setup.py b/logging/setup.py index c211b10f7fc0..2b11432fd5e8 100644 --- a/logging/setup.py +++ b/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', ] diff --git a/pubsub/setup.py b/pubsub/setup.py index 35235ba30cc6..702b99849db1 100644 --- a/pubsub/setup.py +++ b/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', ] diff --git a/spanner/setup.py b/spanner/setup.py index 588bb3f0ad59..24fd0ffa728e 100644 --- a/spanner/setup.py +++ b/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', ] diff --git a/speech/setup.py b/speech/setup.py index a3c86d241a29..8a15fe7b10b2 100644 --- a/speech/setup.py +++ b/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( diff --git a/trace/setup.py b/trace/setup.py index b646766e2d20..c14fbbedc7a8 100644 --- a/trace/setup.py +++ b/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( diff --git a/videointelligence/setup.py b/videointelligence/setup.py index 61c4a30b2d98..d093dca5631d 100644 --- a/videointelligence/setup.py +++ b/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', diff --git a/vision/setup.py b/vision/setup.py index b29c32fe5ec5..f8834069a7e7 100644 --- a/vision/setup.py +++ b/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'],