Migrate from closure_js_proto_library to closure_proto_library

humpydonkey · Dec 9, 2018 · 35a5e53 · 35a5e53
1 parent acfa1c5
commit 35a5e53
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 27 deletions.
diff --git a/facets_atlasmaker/BUILD b/facets_atlasmaker/BUILD
@@ -6,8 +6,8 @@ py_binary(
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        ":convert",
         ":atlasmaker_io",
+        ":convert",
     ],
 )
 
@@ -23,4 +23,4 @@ py_library(
     name = "atlasmaker_io",
     srcs = ["atlasmaker_io.py"],
     srcs_version = "PY2AND3",
-)
+)
diff --git a/facets_atlasmaker/utils/BUILD b/facets_atlasmaker/utils/BUILD
@@ -5,4 +5,4 @@ py_binary(
     srcs = ["wikipedia_sourcelist_generator.py"],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
-)
+)
diff --git a/facets_overview/common/BUILD b/facets_overview/common/BUILD
@@ -20,11 +20,11 @@ tf_web_library(
         "proto.featureStatistics.StringStatistics",
         "proto.featureStatistics.CommonStatistics",
         "proto.featureStatistics.Histogram",
-        "proto.featureStatistics.RankHistogram"
+        "proto.featureStatistics.RankHistogram",
     ],
     path = "/facets-overview/common",
     deps = [
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:plottable",
     ],

diff --git a/facets_overview/common/test/BUILD b/facets_overview/common/test/BUILD
@@ -13,11 +13,12 @@ closure_js_library(
 
 tf_web_library(
     name = "test",
+    testonly = True,
     srcs = [
         "feature_statistics_generator_test.ts",
         "overview_data_model_test.ts",
-        "utils_test.ts",
         "test.html",
+        "utils_test.ts",
     ],
     clutz_entry_points = [
         "proto.featureStatistics.DatasetFeatureStatistics",
@@ -27,16 +28,15 @@ tf_web_library(
         "proto.featureStatistics.StringStatistics",
         "proto.featureStatistics.CommonStatistics",
         "proto.featureStatistics.Histogram",
-        "proto.featureStatistics.RankHistogram"
+        "proto.featureStatistics.RankHistogram",
     ],
     path = "/facets-overview/common/test",
     deps = [
         ":externs",
-        "//facets_overview/proto",
         "//facets_overview/common",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:web_component_tester",
     ],
-    testonly = True
 )
 
 # Compiles standalone HTML file that tests facets-overview common files.

diff --git a/facets_overview/components/facets_overview/BUILD b/facets_overview/components/facets_overview/BUILD
@@ -7,9 +7,9 @@ licenses(["notice"])  # Apache 2.0
 tf_web_library(
     name = "facets_overview",
     srcs = [
-        "facets-overview-filter-validator.html",
         "facets-overview.html",
         "facets-overview.ts",
+        "facets-overview-filter-validator.html",
     ],
     clutz_entry_points = [
         "proto.featureStatistics.DatasetFeatureStatistics",
@@ -25,7 +25,7 @@ tf_web_library(
     deps = [
         "//facets_overview/common",
         "//facets_overview/components/facets_overview_table",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_list",
         "@org_polymer_iron_validator_behavior",
         "@org_polymer_paper_checkbox",

diff --git a/facets_overview/components/facets_overview_chart/BUILD b/facets_overview/components/facets_overview_chart/BUILD
@@ -23,7 +23,7 @@ tf_web_library(
     path = "/facets-overview/components/facets-overview-chart",
     deps = [
         "//facets_overview/common",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_list",
         "@org_polymer_paper_button",
         "@org_polymer_paper_checkbox",

diff --git a/facets_overview/components/facets_overview_row_legend/BUILD b/facets_overview/components/facets_overview_row_legend/BUILD
@@ -23,7 +23,7 @@ tf_web_library(
     path = "/facets-overview/components/facets-overview-row-legend",
     deps = [
         "//facets_overview/common",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
diff --git a/facets_overview/components/facets_overview_row_stats/BUILD b/facets_overview/components/facets_overview_row_stats/BUILD
@@ -23,7 +23,7 @@ tf_web_library(
     path = "/facets-overview/components/facets-overview-row-stats",
     deps = [
         "//facets_overview/common",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],

diff --git a/facets_overview/components/facets_overview_table/BUILD b/facets_overview/components/facets_overview_table/BUILD
@@ -18,15 +18,15 @@ tf_web_library(
         "proto.featureStatistics.StringStatistics",
         "proto.featureStatistics.CommonStatistics",
         "proto.featureStatistics.Histogram",
-        "proto.featureStatistics.RankHistogram"
+        "proto.featureStatistics.RankHistogram",
     ],
     path = "/facets-overview/components/facets-overview-table",
     deps = [
         "//facets_overview/common",
         "//facets_overview/components/facets_overview_chart",
         "//facets_overview/components/facets_overview_row_legend",
         "//facets_overview/components/facets_overview_row_stats",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_list",
         "@org_polymer_paper_dropdown_menu",
         "@org_polymer_paper_item",

diff --git a/facets_overview/functional_tests/many/BUILD b/facets_overview/functional_tests/many/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/functional_tests/simple/BUILD b/facets_overview/functional_tests/simple/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/functional_tests/single/BUILD b/facets_overview/functional_tests/single/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/functional_tests/single_feature/BUILD b/facets_overview/functional_tests/single_feature/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/functional_tests/stress/BUILD b/facets_overview/functional_tests/stress/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/functional_tests/test_helpers/BUILD b/facets_overview/functional_tests/test_helpers/BUILD
@@ -33,6 +33,6 @@ tf_web_library(
     deps = [
         ":externs",
         "//facets_overview/common",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
     ],
 )
diff --git a/facets_overview/functional_tests/weighted/BUILD b/facets_overview/functional_tests/weighted/BUILD
@@ -30,7 +30,7 @@ tf_web_library(
         "//facets_overview/common",
         "//facets_overview/components/facets_overview",
         "//facets_overview/functional_tests/test_helpers",
-        "//facets_overview/proto",
+        "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",

diff --git a/facets_overview/proto/BUILD b/facets_overview/proto/BUILD
@@ -1,10 +1,28 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_proto_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_proto_library")
 
 licenses(["notice"])  # Apache 2.0
 
-closure_js_proto_library(
+proto_library(
+    name = "feature_statistics_proto",
+    srcs = [
+        "feature_statistics.proto",
+    ],
+)
+
+closure_proto_library(
+    name = "feature_statistics_closure_proto",
+    deps = [
+        ":feature_statistics_proto",
+    ],
+)
+
+# TODO: Remove when all callers are migrated to '//facets_overview/:feature_statistics_closure_proto'.
+closure_proto_library(
     name = "proto",
-    srcs = ["feature_statistics.proto"],
-)
+    deprecation = "Please migrate to '//facets_overview/proto:feature_statistics_closure_proto'.",
+    deps = [
+        ":feature_statistics_proto",
+    ],
+)