Merge changes from GitHub, clean up linter errors, fix dependencies test.
Change: 114064632
diff --git a/util/python/python_config.sh b/util/python/python_config.sh
index 79b7a9d..9515ffa 100755
--- a/util/python/python_config.sh
+++ b/util/python/python_config.sh
@@ -16,7 +16,14 @@
set -e -o errexit
-EXPECTED_PATHS="util/python/python_include util/python/python_lib third_party/py/numpy/numpy_include"
+# Prefix expected paths with ./ locally and external/reponame/ for remote repos.
+# TODO(kchodorow): remove once runfiles paths are fixed, see
+# https://github.com/bazelbuild/bazel/issues/848.
+script_path=$(dirname $(dirname $(dirname "$0")))
+script_path=${script_path:-.}
+EXPECTED_PATHS="$script_path/util/python/python_include"\
+" $script_path/util/python/python_lib"\
+" $script_path/third_party/py/numpy/numpy_include"
function main {
argument="$1"