Address comments.

- Fix sanit test check_bazel_workspace.py.
- Use the new `grpc_extra_deps` in the Bazel workspace test.
pull/20586/head
Danjie Wenren 6 years ago
parent c22c215ea5
commit 93e8830070
  1. 14
      bazel/test/python_test_repo/WORKSPACE
  2. 2
      tools/run_tests/sanity/check_bazel_workspace.py

@ -4,17 +4,9 @@ local_repository(
) )
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
grpc_deps()
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
protobuf_deps()
# TODO(https://github.com/grpc/grpc/issues/19835): Remove. grpc_deps()
load("@upb//bazel:workspace_deps.bzl", "upb_deps")
upb_deps()
load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
apple_rules_dependencies()
load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") grpc_extra_deps()
apple_support_dependencies()

@ -64,6 +64,7 @@ _GRPC_DEP_NAMES = [
_TWISTED_CONSTANTLY_DEP_NAME, _TWISTED_CONSTANTLY_DEP_NAME,
'io_bazel_rules_go', 'io_bazel_rules_go',
'build_bazel_rules_apple', 'build_bazel_rules_apple',
'build_bazel_apple_support',
] ]
_GRPC_BAZEL_ONLY_DEPS = [ _GRPC_BAZEL_ONLY_DEPS = [
@ -79,6 +80,7 @@ _GRPC_BAZEL_ONLY_DEPS = [
_TWISTED_CONSTANTLY_DEP_NAME, _TWISTED_CONSTANTLY_DEP_NAME,
'io_bazel_rules_go', 'io_bazel_rules_go',
'build_bazel_rules_apple', 'build_bazel_rules_apple',
'build_bazel_apple_support',
] ]

Loading…
Cancel
Save