Add missing numpy and six deps

Change: 143131671

24 files changed, 144 insertions, 19 deletions

diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index 9658fec152..a0162dffb2 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -97,6 +97,7 @@ tf_py_test(
         "python/ops/gmm_test.py",
     ],
     additional_deps = [
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
@@ -113,6 +114,7 @@ tf_py_test(
     ],
     additional_deps = [
         ":factorization_py",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform",
@@ -124,6 +126,7 @@ tf_py_test(
     name = "factorization_ops_test",
     srcs = ["python/ops/factorization_ops_test.py"],
     additional_deps = [
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
@@ -135,6 +138,7 @@ tf_py_test(
     name = "wals_solver_ops_test",
     srcs = ["python/kernel_tests/wals_solver_ops_test.py"],
     additional_deps = [
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
@@ -145,6 +149,7 @@ tf_py_test(
     name = "clustering_ops_test",
     srcs = ["python/kernel_tests/clustering_ops_test.py"],
     additional_deps = [
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
diff --git a/tensorflow/contrib/framework/BUILD b/tensorflow/contrib/framework/BUILD
index 44017c82ea..245ade9f91 100644
--- a/tensorflow/contrib/framework/BUILD
+++ b/tensorflow/contrib/framework/BUILD
@@ -89,7 +89,10 @@ py_test(
     size = "small",
     srcs = ["python/ops/arg_scope_test.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_test(
@@ -98,7 +101,10 @@ py_test(
     srcs = ["python/framework/checkpoint_utils_test.py"],
     srcs_version = "PY2AND3",
     tags = ["manual"],  # http://b/30468735
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_test(
@@ -106,7 +112,10 @@ py_test(
     size = "small",
     srcs = ["python/ops/ops_test.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_test(
@@ -114,7 +123,10 @@ py_test(
     size = "small",
     srcs = ["python/ops/prettyprint_ops_test.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_test(
@@ -125,6 +137,7 @@ py_test(
         ":framework_py",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -132,7 +145,10 @@ py_test(
     name = "tensor_util_test",
     srcs = ["python/framework/tensor_util_test.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_test(
@@ -141,7 +157,10 @@ py_test(
     srcs = ["python/ops/variables_test.py"],
     srcs_version = "PY2AND3",
     tags = ["manual"],
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 filegroup(
diff --git a/tensorflow/contrib/image/BUILD b/tensorflow/contrib/image/BUILD
index fcffbe7855..f5daa492aa 100644
--- a/tensorflow/contrib/image/BUILD
+++ b/tensorflow/contrib/image/BUILD
@@ -61,6 +61,7 @@ cuda_py_test(
     size = "medium",
     srcs = ["python/kernel_tests/image_ops_test.py"],
     additional_deps = [
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/contrib:contrib_py",
         "//tensorflow/python:framework_test_lib",
diff --git a/tensorflow/contrib/integrate/BUILD b/tensorflow/contrib/integrate/BUILD
index 1df5f0a9f0..9afb330920 100644
--- a/tensorflow/contrib/integrate/BUILD
+++ b/tensorflow/contrib/integrate/BUILD
@@ -31,6 +31,7 @@ py_test(
     deps = [
         ":integrate_py",
         "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index 5484866fdb..71bb2f6f5a 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -152,6 +152,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -165,6 +166,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -177,6 +179,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -190,6 +193,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -203,6 +207,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -217,6 +222,7 @@ py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:init_ops",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -230,6 +236,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -243,6 +250,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -256,6 +264,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -269,6 +278,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -282,6 +292,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -295,6 +306,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -308,6 +320,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index 883bb8f075..3976d3409e 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -64,6 +64,7 @@ py_library(
         "//tensorflow/python/saved_model:signature_constants",
         "//tensorflow/python/saved_model:signature_def_utils",
         "//tensorflow/python/saved_model:tag_constants",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -732,6 +733,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_test_lib",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/learn/python/learn/datasets/BUILD b/tensorflow/contrib/learn/python/learn/datasets/BUILD
index 3ece16170a..84d5230dbe 100644
--- a/tensorflow/contrib/learn/python/learn/datasets/BUILD
+++ b/tensorflow/contrib/learn/python/learn/datasets/BUILD
@@ -26,6 +26,7 @@ py_library(
     deps = [
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/lookup/BUILD b/tensorflow/contrib/lookup/BUILD
index c1d8ddfd10..3f221188a4 100644
--- a/tensorflow/contrib/lookup/BUILD
+++ b/tensorflow/contrib/lookup/BUILD
@@ -37,6 +37,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/losses/BUILD b/tensorflow/contrib/losses/BUILD
index f76a8f62cb..9857a2d01f 100644
--- a/tensorflow/contrib/losses/BUILD
+++ b/tensorflow/contrib/losses/BUILD
@@ -35,6 +35,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/metrics/BUILD b/tensorflow/contrib/metrics/BUILD
index 0dbc2446a9..13221f8cc7 100644
--- a/tensorflow/contrib/metrics/BUILD
+++ b/tensorflow/contrib/metrics/BUILD
@@ -52,6 +52,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -65,6 +66,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -78,6 +80,7 @@ py_test(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/ndlstm/BUILD b/tensorflow/contrib/ndlstm/BUILD
index e1a23d16c6..f115af8c83 100644
--- a/tensorflow/contrib/ndlstm/BUILD
+++ b/tensorflow/contrib/ndlstm/BUILD
@@ -33,6 +33,7 @@ tf_py_test(
     srcs = ["python/lstm1d_test.py"],
     additional_deps = [
         ":ndlstm",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
     ],
 )
@@ -42,6 +43,7 @@ tf_py_test(
     srcs = ["python/lstm2d_test.py"],
     additional_deps = [
         ":ndlstm",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
     ],
@@ -52,6 +54,7 @@ tf_py_test(
     srcs = ["python/misc_test.py"],
     additional_deps = [
         ":ndlstm",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         # "//tensorflow:tensorflow_py:tensorflow_google",
diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index f14ae879fc..e5132295f3 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -36,6 +36,7 @@ py_test(
         ":opt_py",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:extra_py_tests_deps",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -49,6 +50,7 @@ py_test(
     deps = [
         ":opt_py",
         "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -62,6 +64,7 @@ py_test(
     deps = [
         ":opt_py",
         "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/specs/BUILD b/tensorflow/contrib/specs/BUILD
index 9c9e99b793..3106619e8e 100644
--- a/tensorflow/contrib/specs/BUILD
+++ b/tensorflow/contrib/specs/BUILD
@@ -35,6 +35,7 @@ tf_py_test(
     srcs = ["python/specs_test.py"],
     additional_deps = [
         ":specs",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
     ],
 )
@@ -44,6 +45,7 @@ tf_py_test(
     srcs = ["python/summaries_test.py"],
     additional_deps = [
         ":specs",
+        "//third_party/py/numpy",
         "//tensorflow:tensorflow_py",
     ],
 )
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index d83939c6ae..a9de4f181e 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -33,6 +33,7 @@ py_library(
     deps = [
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/tools/tfprof:protos_all_py",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/examples/tutorials/mnist/BUILD b/tensorflow/examples/tutorials/mnist/BUILD
index 412895f353..464e0b9d15 100644
--- a/tensorflow/examples/tutorials/mnist/BUILD
+++ b/tensorflow/examples/tutorials/mnist/BUILD
@@ -26,6 +26,7 @@ py_library(
     deps = [
         "//tensorflow:tensorflow_py",
         "//tensorflow/contrib/learn/python/learn/datasets",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/g3doc/how_tos/adding_an_op/BUILD b/tensorflow/g3doc/how_tos/adding_an_op/BUILD
index 7accc8e923..ffaf9349d2 100644
--- a/tensorflow/g3doc/how_tos/adding_an_op/BUILD
+++ b/tensorflow/g3doc/how_tos/adding_an_op/BUILD
@@ -73,6 +73,7 @@ py_test(
     deps = [
         ":zero_out_op_1",
         "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -96,6 +97,7 @@ py_test(
     deps = [
         ":zero_out_op_3",
         "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 8fc4f8cc93..67cd31c005 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -89,6 +89,7 @@ py_library(
         ":pywrap_tensorflow",
         ":util",
         "//tensorflow/core:protos_all_py",
+        "@six_archive//:six",
     ],
 )
 
@@ -342,6 +343,7 @@ py_library(
         ":platform",
         ":pywrap_tensorflow",
         ":util",
+        "@six_archive//:six",
     ],
 )
 
@@ -360,6 +362,10 @@ py_library(
 py_library(
     name = "extra_py_tests_deps",
     srcs_version = "PY2AND3",
+    deps = [
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
 )
 
 py_library(
@@ -376,6 +382,7 @@ py_library(
         ":pywrap_tensorflow",
         ":session",
         ":util",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -939,6 +946,7 @@ py_library(
         ":framework_for_generated_wrappers",
         ":math_ops_gen",
         ":util",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -1795,6 +1803,7 @@ py_library(
         ":user_ops_gen",
         ":variable_scope",
         ":variables",
+        "@six_archive//:six",
     ],
 )
 
@@ -2070,6 +2079,7 @@ py_library(
         ":util",
         ":variable_scope",
         ":variables",
+        "@six_archive//:six",
     ],
 )
 
@@ -2089,6 +2099,7 @@ py_library(
         ":platform",
         ":session_ops",
         ":util",
+        "@six_archive//:six",
     ],
 )
 
@@ -2102,7 +2113,11 @@ py_library(
         ],
     ),
     srcs_version = "PY2AND3",
-    deps = ["@protobuf//:protobuf_python"],
+    deps = [
+        "//third_party/py/numpy",
+        "@protobuf//:protobuf_python",
+        "@six_archive//:six",
+    ],
 )
 
 py_test(
@@ -2179,6 +2194,7 @@ py_test(
         ":compare_test_proto_py",
         ":platform_test",
         ":util",
+        "@six_archive//:six",
     ],
 )
 
@@ -2331,11 +2347,11 @@ tf_py_wrap_cc(
         ":py_record_writer_lib",
         ":python_op_gen",
         ":tf_session_helper",
-        "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
-        "//tensorflow/core/distributed_runtime/rpc:grpc_session",
         "//tensorflow/c:c_api",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/c:tf_status_helper",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_session",
         "//tensorflow/core:lib",
         "//tensorflow/core/debug",
         "//tensorflow/core/distributed_runtime:server_lib",
@@ -2371,6 +2387,7 @@ py_library(
         ":pywrap_tensorflow",
         ":session_ops",
         ":util",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -2471,6 +2488,7 @@ py_test(
         ":training",
         ":util",
         ":variables",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index fa3382ab42..683809284b 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -35,6 +35,7 @@ py_library(
     deps = [
         "//tensorflow/python:framework",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -56,6 +57,7 @@ py_library(
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:session_ops",
+        "@six_archive//:six",
     ],
 )
 
@@ -76,7 +78,10 @@ py_library(
     name = "debugger_cli_common",
     srcs = ["cli/debugger_cli_common.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow/python:platform"],
+    deps = [
+        "//tensorflow/python:platform",
+        "@six_archive//:six",
+    ],
 )
 
 py_library(
@@ -103,6 +108,7 @@ py_library(
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:variables",
+        "@six_archive//:six",
     ],
 )
 
@@ -117,6 +123,7 @@ py_library(
         ":debug_data",
         ":debugger_cli_common",
         ":tensor_format",
+        "@six_archive//:six",
     ],
 )
 
@@ -130,6 +137,8 @@ py_library(
         ":debugger_cli_common",
         ":stepper",
         ":tensor_format",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
 )
 
@@ -141,6 +150,7 @@ py_library(
         ":command_parser",
         ":debugger_cli_common",
         ":tensor_format",
+        "@six_archive//:six",
     ],
 )
 
@@ -189,14 +199,21 @@ py_binary(
     name = "debug_fibonacci",
     srcs = ["examples/debug_fibonacci.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
 )
 
 py_binary(
     name = "debug_errors",
     srcs = ["examples/debug_errors.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_binary(
@@ -213,7 +230,11 @@ py_binary(
     name = "debug_tflearn_iris",
     srcs = ["examples/debug_tflearn_iris.py"],
     srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
 )
 
 py_test(
@@ -248,6 +269,7 @@ py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:session",
         "//tensorflow/python:variables",
+        "@six_archive//:six",
     ],
 )
 
@@ -309,6 +331,7 @@ py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -332,6 +355,7 @@ py_library(
         "//tensorflow/python:session",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:variables",
+        "@six_archive//:six",
     ],
 )
 
@@ -393,6 +417,7 @@ py_test(
         ":tensor_format",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "@six_archive//:six",
     ],
 )
 
@@ -425,6 +450,7 @@ cuda_py_test(
         ":debug_data",
         ":debug_utils",
         ":debugger_cli_common",
+        "@six_archive//:six",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
@@ -448,6 +474,8 @@ cuda_py_test(
     additional_deps = [
         ":stepper",
         ":stepper_cli",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
         "//tensorflow/python:framework",
diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index 9278b90657..838a7a54f8 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -27,6 +27,7 @@ py_binary(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
@@ -77,6 +78,7 @@ py_binary(
         ":strip_unused_lib",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
@@ -109,6 +111,7 @@ py_library(
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
@@ -120,6 +123,7 @@ py_binary(
         ":optimize_for_inference_lib",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index a16626915e..b0f572dfe2 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -18,6 +18,7 @@ py_library(
         "//tensorflow/python:util",
         "//tensorflow/tensorboard:plugins",
         "//tensorflow/tensorboard/lib/python:http",
+        "@six_archive//:six",
     ],
 )
 
@@ -48,6 +49,7 @@ py_library(
         ":handler",
         "//tensorflow/python:platform",
         "//tensorflow/python:summary",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/tensorboard/scripts/BUILD b/tensorflow/tensorboard/scripts/BUILD
index e2e5416bf0..3726aac9df 100644
--- a/tensorflow/tensorboard/scripts/BUILD
+++ b/tensorflow/tensorboard/scripts/BUILD
@@ -16,6 +16,7 @@ py_binary(
         "//tensorflow/python:platform",
         "//tensorflow/python:summary",
         "//tensorflow/tensorboard/backend:server",
+        "@six_archive//:six",
     ],
 )
 
@@ -26,6 +27,8 @@ py_binary(
     deps = [
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/tools/quantization/BUILD b/tensorflow/tools/quantization/BUILD
index 9220fd99ab..76cf22cd9d 100644
--- a/tensorflow/tools/quantization/BUILD
+++ b/tensorflow/tools/quantization/BUILD
@@ -26,6 +26,7 @@ py_binary(
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/tools/test/BUILD b/tensorflow/tools/test/BUILD
index 4bea35d349..cb2644c670 100644
--- a/tensorflow/tools/test/BUILD
+++ b/tensorflow/tools/test/BUILD
@@ -105,4 +105,5 @@ py_test(
     srcs = ["check_futures_test.py"],
     data = ["//tensorflow:all_opensource_files"],
     srcs_version = "PY2AND3",
+    deps = ["@six_archive//:six"],
 )
diff --git a/third_party/py/numpy/BUILD b/third_party/py/numpy/BUILD
index c025984cca..1d461505a6 100644
--- a/third_party/py/numpy/BUILD
+++ b/third_party/py/numpy/BUILD
@@ -2,13 +2,22 @@ licenses(["restricted"])
 
 package(default_visibility = ["//visibility:public"])
 
+py_library(
+    name = "numpy",
+    srcs = ["tf_numpy_dummy.py"],
+    srcs_version = "PY2AND3",
+)
+
 cc_library(
     name = "headers",
-    hdrs = glob([
-        "numpy_include/**/*.h",
-    ]),
+    hdrs = glob(["numpy_include/**/*.h"]),
     data = ["//util/python:python_checked"],
-    includes = [
-        "numpy_include",
-    ],
+    includes = ["numpy_include"],
+)
+
+genrule(
+    name = "dummy",
+    outs = ["tf_numpy_dummy.py"],
+    cmd = "touch $@",
+    visibility = ["//visibility:private"],
 )