Merge pull request RobotLocomotion#9001 from jwnimmer-tri/buildifier

workspace: Upgrade to buildifier 0.12.0
Tomato1107 · Jun 15, 2018 · 723783a · 723783a
2 parents 6f48091 + c90e851
commit 723783a
Show file tree

Hide file tree

Showing 85 changed files with 813 additions and 397 deletions.
diff --git a/examples/acrobot/BUILD.bazel b/examples/acrobot/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load(

diff --git a/examples/compass_gait/BUILD.bazel b/examples/compass_gait/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/double_pendulum/BUILD.bazel b/examples/double_pendulum/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/geometry_world/BUILD.bazel b/examples/geometry_world/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load(
     "@drake//tools/vector_gen:vector_gen.bzl",

diff --git a/examples/kinova_jaco_arm/BUILD.bazel b/examples/kinova_jaco_arm/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/kuka_iiwa_arm/BUILD.bazel b/examples/kuka_iiwa_arm/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load(
     "//tools/skylark:drake_py.bzl",

diff --git a/examples/kuka_iiwa_arm/controlled_kuka/BUILD.bazel b/examples/kuka_iiwa_arm/controlled_kuka/BUILD.bazel
@@ -2,8 +2,8 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/kuka_iiwa_arm/dev/box_rotation/BUILD.bazel b/examples/kuka_iiwa_arm/dev/box_rotation/BUILD.bazel
@@ -2,8 +2,8 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/kuka_iiwa_arm/dev/monolithic_pick_and_place/BUILD.bazel b/examples/kuka_iiwa_arm/dev/monolithic_pick_and_place/BUILD.bazel
@@ -3,8 +3,8 @@
 load(
     "//tools:drake.bzl",
     "drake_cc_binary",
-    "drake_cc_library",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/kuka_iiwa_arm/dev/pick_and_place/BUILD.bazel b/examples/kuka_iiwa_arm/dev/pick_and_place/BUILD.bazel
@@ -3,8 +3,8 @@
 load(
     "//tools:drake.bzl",
     "drake_cc_binary",
-    "drake_cc_library",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/kuka_iiwa_arm/iiwa_world/BUILD.bazel b/examples/kuka_iiwa_arm/iiwa_world/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/multibody/acrobot/BUILD.bazel b/examples/multibody/acrobot/BUILD.bazel
@@ -3,9 +3,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/multibody/bouncing_ball/BUILD.bazel b/examples/multibody/bouncing_ball/BUILD.bazel
@@ -3,9 +3,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/multibody/inclined_plane/BUILD.bazel b/examples/multibody/inclined_plane/BUILD.bazel
@@ -3,9 +3,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/multibody/pendulum/BUILD.bazel b/examples/multibody/pendulum/BUILD.bazel
@@ -3,9 +3,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/particles/BUILD.bazel b/examples/particles/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/pendulum/BUILD.bazel b/examples/pendulum/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/pr2/BUILD.bazel b/examples/pr2/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load("//tools/install:install_data.bzl", "install_data")

diff --git a/examples/quadrotor/BUILD.bazel b/examples/quadrotor/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/rimless_wheel/BUILD.bazel b/examples/rimless_wheel/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")

diff --git a/examples/rod2d/BUILD.bazel b/examples/rod2d/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load(
     "@drake//tools/vector_gen:vector_gen.bzl",

diff --git a/examples/schunk_wsg/BUILD.bazel b/examples/schunk_wsg/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
+    "drake_cc_binary",
     "drake_cc_googletest",
     "drake_cc_library",
-    "drake_cc_binary",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/examples/van_der_pol/BUILD.bazel b/examples/van_der_pol/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "//tools:drake.bzl",
-    "drake_cc_library",
     "drake_cc_binary",
     "drake_cc_googletest",
+    "drake_cc_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/multibody/benchmarks/acrobot/BUILD.bazel b/multibody/benchmarks/acrobot/BUILD.bazel
@@ -2,9 +2,9 @@
 
 load(
     "@drake//tools/skylark:drake_cc.bzl",
+    "drake_cc_googletest",
     "drake_cc_library",
     "drake_cc_package_library",
-    "drake_cc_googletest",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/tools/clion/aspect.bzl b/tools/clion/aspect.bzl
@@ -3,8 +3,8 @@
 # Load the relevant upstream methods.
 load(
     "@intellij_aspect//:intellij_info_impl.bzl",
-    "make_intellij_info_aspect",
     "intellij_info_aspect_impl",
+    "make_intellij_info_aspect",
 )
 load(
     "@intellij_aspect//:intellij_info_bundled.bzl",
@@ -40,6 +40,7 @@ def _extra_ide_info(target, ctx, ide_info, ide_info_file, output_groups):
     if includes == None:
         # No includes exist, so we don't need to override them.
         return False
+
     # Place Drake's parent directory on CLion's include path.
     includes.insert(0, additional_transitive_quote_include_directory)
     return False

diff --git a/tools/clion/repository.bzl b/tools/clion/repository.bzl
@@ -24,16 +24,19 @@ def _impl(repository_ctx):
     # Write out the path to a bzl constant.
     bzl_content = [
         'additional_transitive_quote_include_directory = "{}"'.format(
-            drake_workspace_parent),
+            drake_workspace_parent,
+        ),
     ]
     repository_ctx.file(
         "BUILD.bazel",
         content = "\n",
-        executable = False)
+        executable = False,
+    )
     repository_ctx.file(
         "path.bzl",
         content = "".join(bzl_content),
-        executable = False)
+        executable = False,
+    )
 
 def drake_clion_environment():
     rule = repository_rule(

diff --git a/tools/external_data/expose_all_files.bzl b/tools/external_data/expose_all_files.bzl
@@ -64,6 +64,7 @@ def expose_all_files(
     @param sub_dirs
         Any directories that are not packages.
     """
+
     # @note It'd be nice if this could respect *ignore files, but meh.
     # Also, it'd be **super** nice if Bazel did not let `**` globs leak into
     # other packages and then error out.
@@ -76,17 +77,22 @@ def expose_all_files(
         srcs = native.glob(patterns)
         for sub_dir in sub_dirs:
             srcs += native.glob([
-                sub_dir + "/" + pattern for pattern in patterns])
+                sub_dir + "/" + pattern
+                for pattern in patterns
+            ])
         native.filegroup(
             name = name,
             srcs = srcs,
             # Trying to use `data = deps` here only exposes the files in
             # runfiles, but not for expansion via `$(locations...)`.
             visibility = visibility,
         )
+
         # Expose all files recursively (from one level).
-        deps = [package_prefix + sub_package + ":" + name + "_recursive"
-                for sub_package in sub_packages]
+        deps = [
+            package_prefix + sub_package + ":" + name + "_recursive"
+            for sub_package in sub_packages
+        ]
         recursive_filegroup(
             name = name + "_recursive",
             data = [name] + deps,

diff --git a/tools/external_data/test/external_data_pkg_test/drake_path.bzl b/tools/external_data/test/external_data_pkg_test/drake_path.bzl
@@ -6,8 +6,8 @@
 
 def _dirname(p, remove = 1):
     # Returns parent directory name for a path `p`.
-    pieces = p.split('/')
-    return '/'.join(pieces[0:-remove])
+    pieces = p.split("/")
+    return "/".join(pieces[0:-remove])
 
 def get_drake_path(workspace_dir):
     """Returns path of Drake. This is replaced under

diff --git a/tools/external_data/test/external_data_workspace_test.bzl b/tools/external_data/test/external_data_workspace_test.bzl
@@ -4,8 +4,8 @@ load(
 )
 load(
     "//tools/external_data/test:workspace_test.bzl",
-    "workspace_test",
     "ARGS_DEFAULT",
+    "workspace_test",
 )
 
 _workspace_list = [
@@ -59,8 +59,10 @@ def collect_external_data_lint_files():
     packages = ["//tools/external_data"]
     for workspace in _workspace_list:
         package = "@" + workspace + "//"
+
         # Prepare to expose all files recursively.
         packages.append(package)
+
     # Join files for linting, to permit $(locations ...) expansion directly
     # on transitive file dependencies.
     for name in ["bazel_lint_files", "python_lint_files"]:
@@ -75,6 +77,7 @@ def add_external_data_test_repositories(workspace_dir):
     Adds test workspace directories as repositories so that their files can be
     consumed and their tests can be ignored by `bazel test ...` from Drake.
     """
+
     # WARNING: Bazel also craps out here if `workspace_dir + path` is used
     # rather than just `path`.
     # N.B. This error is *stateful*. You will get different behavior depending