aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Richard Belleville <rbellevi@google.com>2018-11-09 16:40:18 -0800
committerGravatar Richard Belleville <rbellevi@google.com>2018-11-09 16:53:43 -0800
commitc477cb859755a5932472cfdb1af2aaf5b46ee78e (patch)
treedb3f90781d4ef2f19e6dac0bc48ad46ac1cb3186
parent6a368df7ab746c973d41cf0b53494577ee1874f3 (diff)
Add missing transitive dependencies
This commit resolves an interop test currently failing on master. Over the past couple of weeks, bazel-based tests have been introduced. The current setup does not appear to automatically handle transitive dependencies. Instead, transitive dependencies such as `requests` have been manually added to `requirements.bazel.txt`. It appears that the build server happened to have the dependencies of the `requests` library installed already, but later had a configuration wipe. This was compounded by the google-auth library erroneously reporting that the `requests` module itself was not installed. In fact, it was the transitive dependencies of `requests` that were not being installed by the build file. (third-order dependencies of our test) I consider this a quick fix to get the build passing. In the long run, we need to automatically resolve and install transitive dependencies in our bazel builds. Resolves: #17170
-rw-r--r--requirements.bazel.txt4
-rw-r--r--src/python/grpcio_tests/tests/interop/BUILD.bazel4
2 files changed, 8 insertions, 0 deletions
diff --git a/requirements.bazel.txt b/requirements.bazel.txt
index efbf5314af..61e529a6ec 100644
--- a/requirements.bazel.txt
+++ b/requirements.bazel.txt
@@ -9,3 +9,7 @@ futures>=2.2.0
google-auth>=1.0.0
oauth2client==4.1.0
requests>=2.14.2
+urllib3==1.22
+chardet==3.0.4
+certifi==2017.4.17
+idna==2.7
diff --git a/src/python/grpcio_tests/tests/interop/BUILD.bazel b/src/python/grpcio_tests/tests/interop/BUILD.bazel
index a39f30d32a..aebdbf67eb 100644
--- a/src/python/grpcio_tests/tests/interop/BUILD.bazel
+++ b/src/python/grpcio_tests/tests/interop/BUILD.bazel
@@ -35,6 +35,10 @@ py_library(
requirement('google-auth'),
requirement('requests'),
requirement('enum34'),
+ requirement('urllib3'),
+ requirement('chardet'),
+ requirement('certifi'),
+ requirement('idna'),
],
imports=["../../",],
)