From dde1aba0eaecd59c7754aab513aba89111a69a77 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 2 Oct 2017 10:26:36 -0700 Subject: [PATCH 1/3] 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]`) --- core/setup.py | 3 ++- language/setup.py | 1 - logging/setup.py | 1 - pubsub/setup.py | 2 -- spanner/setup.py | 1 - speech/setup.py | 1 - trace/setup.py | 1 - videointelligence/setup.py | 1 - vision/setup.py | 1 - 9 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/setup.py b/core/setup.py index bae751123e3c..6121976b5d28 100644 --- a/core/setup.py +++ b/core/setup.py @@ -51,7 +51,8 @@ REQUIREMENTS = [ - 'googleapis-common-protos[grpc] >= 1.5.3, < 2.0dev', + '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', diff --git a/language/setup.py b/language/setup.py index 7036b689222d..fb8c9548adbf 100644 --- a/language/setup.py +++ b/language/setup.py @@ -53,7 +53,6 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.27.0, < 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..1133d56820b0 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -52,7 +52,6 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.27.0, < 0.28dev', - '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 35235ba30cc6..1fe40d32e357 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -53,9 +53,7 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.27.0, < 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..73dbcda1f1e7 100644 --- a/spanner/setup.py +++ b/spanner/setup.py @@ -54,7 +54,6 @@ '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.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..0d6865f2886b 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -54,7 +54,6 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.27.0, < 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..f2976150d7ec 100644 --- a/trace/setup.py +++ b/trace/setup.py @@ -9,7 +9,6 @@ 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', ] diff --git a/videointelligence/setup.py b/videointelligence/setup.py index 61c4a30b2d98..9f9bf58cef93 100644 --- a/videointelligence/setup.py +++ b/videointelligence/setup.py @@ -38,7 +38,6 @@ ], packages=find_packages(exclude=('tests*',)), install_requires=( - '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 b29c32fe5ec5..f577c399a600 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -27,7 +27,6 @@ REQUIREMENTS = [ 'google-cloud-core >= 0.27.0, < 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'], From 60a17988c0b443bd794bb648da124db846d75ba8 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 3 Oct 2017 16:36:18 -0700 Subject: [PATCH 2/3] Making `grpc` an extra for `core`. --- core/setup.py | 2 +- language/setup.py | 2 +- logging/setup.py | 2 +- pubsub/setup.py | 2 +- spanner/setup.py | 2 +- speech/setup.py | 2 +- trace/setup.py | 2 +- videointelligence/setup.py | 1 + vision/setup.py | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/setup.py b/core/setup.py index 6121976b5d28..1513eba1832d 100644 --- 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 index fb8c9548adbf..5cce974399ab 100644 --- 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 index 1133d56820b0..2b11432fd5e8 100644 --- 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 index 1fe40d32e357..702b99849db1 100644 --- 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 index 73dbcda1f1e7..24fd0ffa728e 100644 --- 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 index 0d6865f2886b..8a15fe7b10b2 100644 --- 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 index f2976150d7ec..c14fbbedc7a8 100644 --- 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 index 9f9bf58cef93..a053db502067 100644 --- 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 index f577c399a600..f8834069a7e7 100644 --- 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 = { From bf11538e77fdcb7e16713d58bd78b2ad69d35133 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 3 Oct 2017 16:39:57 -0700 Subject: [PATCH 3/3] Adding `googleapis-common-protos` back to `videointelligence`. --- videointelligence/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/videointelligence/setup.py b/videointelligence/setup.py index a053db502067..d093dca5631d 100644 --- a/videointelligence/setup.py +++ b/videointelligence/setup.py @@ -38,6 +38,7 @@ ], packages=find_packages(exclude=('tests*',)), 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',