Use rules_python for Python build rules

mcx · Dec 10, 2019 · 487f01b · 487f01b
1 parent 42c5fc4
commit 487f01b
Show file tree

Hide file tree

Showing 39 changed files with 74 additions and 43 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -3,6 +3,7 @@
 # This file is named BUILD.bazel instead of the more typical BUILD, so that on
 # OSX it won't conflict with a build artifacts directory named "build".
 
+load("//tools/skylark:py.bzl", "py_library")
 load("@drake//tools/install:install.bzl", "install", "install_test")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 

diff --git a/bindings/pydrake/BUILD.bazel b/bindings/pydrake/BUILD.bazel
@@ -10,7 +10,6 @@ load(
     "@drake//tools/skylark:drake_py.bzl",
     "drake_py_binary",
     "drake_py_library",
-    "drake_py_test",
     "drake_py_unittest",
 )
 load(

diff --git a/bindings/pydrake/common/BUILD.bazel b/bindings/pydrake/common/BUILD.bazel
@@ -17,7 +17,6 @@ load(
 load(
     "@drake//tools/skylark:drake_py.bzl",
     "drake_py_library",
-    "drake_py_test",
     "drake_py_unittest",
 )
 load(

diff --git a/bindings/pydrake/manipulation/BUILD.bazel b/bindings/pydrake/manipulation/BUILD.bazel
@@ -9,7 +9,6 @@ load(
 )
 load(
     "@drake//tools/skylark:drake_py.bzl",
-    "drake_py_binary",
     "drake_py_library",
     "drake_py_unittest",
 )

diff --git a/bindings/pydrake/solvers/BUILD.bazel b/bindings/pydrake/solvers/BUILD.bazel
@@ -19,7 +19,6 @@ load(
 load(
     "@drake//tools/skylark:drake_py.bzl",
     "drake_py_library",
-    "drake_py_test",
     "drake_py_unittest",
 )
 load(

diff --git a/examples/kuka_iiwa_arm/BUILD.bazel b/examples/kuka_iiwa_arm/BUILD.bazel
@@ -13,10 +13,6 @@ load(
 load("@drake//tools/install:install.bzl", "install")
 load("@drake//tools/install:install_data.bzl", "install_data")
 load("//tools/lint:lint.bzl", "add_lint_tests")
-load(
-    "@drake//tools/skylark:drake_py.bzl",
-    "drake_py_test",
-)
 
 package(
     default_visibility = [":__subpackages__"],

diff --git a/examples/planar_gripper/BUILD.bazel b/examples/planar_gripper/BUILD.bazel
@@ -2,11 +2,6 @@
 
 load("@drake//tools/install:install.bzl", "install")
 load("//tools/lint:lint.bzl", "add_lint_tests")
-load(
-    "@drake//tools/skylark:drake_py.bzl",
-    "drake_py_binary",
-    "drake_py_library",
-)
 load(
     "@drake//tools/skylark:drake_cc.bzl",
     "drake_cc_binary",

diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_binary", "py_library")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load(
     "@drake//tools/skylark:drake_runfiles_binary.bzl",

diff --git a/tools/bazel.rc b/tools/bazel.rc
@@ -3,6 +3,9 @@ import %workspace%/tools/cc_toolchain/bazel.rc
 import %workspace%/tools/dynamic_analysis/bazel.rc
 import %workspace%/tools/lint/bazel.rc
 
+# Disable native Python rules in Bazel versions before 2.0.
+build --incompatible_load_python_rules_from_bzl=yes
+
 # Default to an optimized build.
 build -c opt
 

diff --git a/tools/external_data/bazel_external_data/BUILD.bazel b/tools/external_data/bazel_external_data/BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_test")
 load("//tools/external_data:expose_all_files.bzl", "expose_all_files")
 
 # For macro testing.

diff --git a/tools/external_data/external_data.bzl b/tools/external_data/external_data.bzl
@@ -1,9 +1,11 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_test")
+
 def external_data_stub_test():
     # Define stub test using upstream package's file.
     file = "@drake//tools/external_data/bazel_external_data:stub_test.py"
-    native.py_test(
+    py_test(
         name = "stub_test",
         srcs = [file],
         main = file,

diff --git a/tools/install/BUILD.bazel b/tools/install/BUILD.bazel
@@ -2,10 +2,10 @@
 
 package(default_visibility = ["//visibility:public"])
 
+load("//tools/skylark:py.bzl", "py_library")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load(
     "@drake//tools/skylark:drake_py.bzl",
-    "drake_py_test",
     "drake_py_unittest",
 )
 

diff --git a/tools/install/dummy/BUILD.bazel b/tools/install/dummy/BUILD.bazel
@@ -1,3 +1,6 @@
+# -*- python -*-
+
+load("//tools/skylark:py.bzl", "py_library")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load("//tools/install:install.bzl", "install")
 load(

diff --git a/tools/install/install.bzl b/tools/install/install.bzl
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_binary")
 load("@drake//tools/skylark:drake_java.bzl", "MainClassInfo")
 load("@drake//tools/skylark:drake_py.bzl", "drake_py_test")
 load(
@@ -794,7 +795,7 @@ def cmake_config(
         if cps_file_name:
             fail("cps_file_name should not be set if " +
                  "script and version_file are set.")
-        native.py_binary(
+        py_binary(
             name = "create-cps",
             srcs = [script],
             main = script,

diff --git a/tools/lint/python_lint.bzl b/tools/lint/python_lint.bzl
@@ -58,6 +58,7 @@ def python_lint(
     Example:
         BUILD:
             load("//tools/lint:python_lint.bzl", "python_lint")
+            load("//tools/skylark:py.bzl", "py_library")
 
             py_library(
                 name = "foo",

diff --git a/tools/skylark/BUILD.bazel b/tools/skylark/BUILD.bazel
@@ -1,9 +1,10 @@
 # -*- python -*-
 
-package(default_visibility = ["//visibility:public"])
-
+load("//tools/skylark:py.bzl", "py_binary")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 
+package(default_visibility = ["//visibility:public"])
+
 # Used by :python_env.bzl.
 config_setting(
     name = "linux",

diff --git a/tools/skylark/alias.bzl b/tools/skylark/alias.bzl
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_library")
 load(
     "@drake//tools/skylark:drake_cc.bzl",
     "drake_cc_library",
@@ -188,7 +189,7 @@ def drake_py_library_aliases(
                 ),
             )
         actual_full_label = "//" + actual_subdir + actual_relative_label
-        native.py_library(
+        py_library(
             name = stub_relative_label[1:],
             deps = [actual_full_label],
             srcs = [stub_file],

diff --git a/tools/skylark/drake_py.bzl b/tools/skylark/drake_py.bzl
@@ -1,5 +1,7 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_binary", "py_library", "py_test")
+
 def drake_py_library(
         name,
         deps = None,
@@ -8,7 +10,7 @@ def drake_py_library(
 
     # Work around https://github.com/bazelbuild/bazel/issues/1567.
     deps = (deps or []) + ["//:module_py"]
-    native.py_library(
+    py_library(
         name = name,
         deps = deps,
         **kwargs
@@ -130,7 +132,7 @@ def drake_py_binary(
         main = srcs[0]
     _py_target_isolated(
         name = name,
-        py_target = native.py_binary,
+        py_target = py_binary,
         isolate = isolate,
         srcs = srcs,
         main = main,
@@ -223,7 +225,7 @@ def drake_py_test(
         tags = tags + ["py"]
     _py_target_isolated(
         name = name,
-        py_target = native.py_test,
+        py_target = py_test,
         isolate = isolate,
         size = size,
         srcs = srcs,
@@ -240,7 +242,7 @@ def py_test_isolated(
     """
     _py_target_isolated(
         name = name,
-        py_target = native.py_test,
+        py_target = py_test,
         isolate = True,
         **kwargs
     )
diff --git a/tools/skylark/py.bzl b/tools/skylark/py.bzl
@@ -0,0 +1,14 @@
+# -*- python -*-
+
+load(
+    "@rules_python//python:defs.bzl",
+    _py_binary = "py_binary",
+    _py_library = "py_library",
+    _py_test = "py_test",
+)
+
+py_binary = _py_binary
+
+py_library = _py_library
+
+py_test = _py_test
diff --git a/tools/skylark/pybind.bzl b/tools/skylark/pybind.bzl
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_library")
 load("@cc//:compiler.bzl", "COMPILER_ID")
 
 # @see bazelbuild/bazel#3493 for needing `@drake//` when loading `install`.
@@ -25,7 +26,7 @@ def pybind_py_library(
         py_srcs = [],
         py_deps = [],
         py_imports = [],
-        py_library_rule = native.py_library,
+        py_library_rule = py_library,
         **kwargs):
     """Declares a pybind11 Python library with C++ and Python portions.
 

diff --git a/tools/workspace/BUILD.bazel b/tools/workspace/BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_library")
 load("@drake//tools/install:check_licenses.bzl", "check_licenses")
 load("@drake//tools/install:install.bzl", "install")
 load(

diff --git a/tools/workspace/clang_cindex_python3/package.BUILD.bazel b/tools/workspace/clang_cindex_python3/package.BUILD.bazel
@@ -1,5 +1,7 @@
 # -*- python -*-
 
+load("@drake//tools/skylark:py.bzl", "py_library")
+
 licenses(["notice"])  # NCSA
 
 py_library(

diff --git a/tools/workspace/drake_visualizer/BUILD.bazel b/tools/workspace/drake_visualizer/BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_library")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 
 exports_files(

diff --git a/tools/workspace/drake_visualizer/plugin/BUILD.bazel b/tools/workspace/drake_visualizer/plugin/BUILD.bazel
@@ -1,3 +1,6 @@
+# -*- python -*-
+
+load("//tools/skylark:py.bzl", "py_library")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 
 py_library(

diff --git a/tools/workspace/drake_visualizer/repository.bzl b/tools/workspace/drake_visualizer/repository.bzl
@@ -83,6 +83,8 @@ def _impl(repository_ctx):
 
 # DO NOT EDIT: generated by drake_visualizer_repository()
 
+load("@drake//tools/skylark:py.bzl", "py_library")
+
 licenses([
     "notice",  # Apache-2.0 AND BSD-3-Clause AND Python-2.0
     "reciprocal",  # MPL-2.0

diff --git a/tools/workspace/github3_py/package.BUILD.bazel b/tools/workspace/github3_py/package.BUILD.bazel
@@ -1,9 +1,7 @@
 # -*- python -*-
 
-load(
-    "@drake//tools/install:install.bzl",
-    "install",
-)
+load("@drake//tools/install:install.bzl", "install")
+load("@drake//tools/skylark:py.bzl", "py_library")
 
 licenses(["notice"])  # BSD-3-Clause
 

diff --git a/tools/workspace/godotengine/package.BUILD.bazel b/tools/workspace/godotengine/package.BUILD.bazel
@@ -1,5 +1,7 @@
 # -*- python -*-
 
+load("@drake//tools/skylark:py.bzl", "py_binary")
+
 licenses([
     "notice",  # Apache-2.0 AND BSD-3-Clause AND ISC AND MIT AND Zlib
     "unencumbered",  # Public-Domain

diff --git a/tools/workspace/lcm/lcm.bzl b/tools/workspace/lcm/lcm.bzl
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_library")
 load(
     "@drake//tools/workspace:generate_include_header.bzl",
     "drake_generate_include_header",
@@ -250,8 +251,7 @@ def lcm_py_library(
     if add_current_package_to_imports:
         if "." not in imports:
             imports = imports + ["."]
-
-    native.py_library(
+    py_library(
         name = name,
         srcs = outs + extra_srcs,
         imports = imports,

diff --git a/tools/workspace/lcm/package.BUILD.bazel b/tools/workspace/lcm/package.BUILD.bazel
@@ -1,8 +1,6 @@
 # -*- python -*-
-load(
-    "@drake//tools/skylark:drake_java.bzl",
-    "drake_java_binary",
-)
+load("@drake//tools/skylark:drake_java.bzl", "drake_java_binary")
+load("@drake//tools/skylark:py.bzl", "py_library")
 load("@drake//tools/workspace:generate_file.bzl", "generate_file")
 load(
     "@drake//tools/workspace:generate_export_header.bzl",

diff --git a/tools/workspace/meshcat_python/package.BUILD.bazel b/tools/workspace/meshcat_python/package.BUILD.bazel
@@ -1,6 +1,7 @@
 # -*- python -*-
 
 load("@drake//tools/install:install.bzl", "install", "install_files")
+load("@drake//tools/skylark:py.bzl", "py_binary", "py_library")
 
 licenses(["notice"])  # MIT
 

diff --git a/tools/workspace/meshcat_python/repository.bzl b/tools/workspace/meshcat_python/repository.bzl
@@ -17,6 +17,7 @@ Example:
         meshcat_python_repository(name = "foo", mirrors = DEFAULT_MIRRORS)
 
     BUILD:
+        load("//tools/skylark:py.bzl", "py_library")
         py_library(
             name = "foobar",
             deps = ["@foo//:meshcat"],

diff --git a/tools/workspace/pybind11/BUILD.bazel b/tools/workspace/pybind11/BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("//tools/skylark:py.bzl", "py_binary")
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load(
     "@drake//tools/skylark:pybind.bzl",

diff --git a/tools/workspace/pycodestyle/package.BUILD.bazel b/tools/workspace/pycodestyle/package.BUILD.bazel
@@ -1,5 +1,6 @@
 # -*- python -*-
 
+load("@drake//tools/skylark:py.bzl", "py_binary")
 load("@drake//tools/workspace:generate_file.bzl", "generate_file")
 
 licenses(["notice"])  # MIT

diff --git a/tools/workspace/pycps/package.BUILD.bazel b/tools/workspace/pycps/package.BUILD.bazel
@@ -1,5 +1,7 @@
 # -*- python -*-
 
+load("@drake//tools/skylark:py.bzl", "py_binary", "py_library")
+
 licenses(["restricted"])  # LGPL-3.0+
 
 genrule(

diff --git a/tools/workspace/pypi.bzl b/tools/workspace/pypi.bzl
@@ -35,6 +35,7 @@ def pypi_archive(
             )
 
         foo.BUILD:
+            load("//tools/skylark:py.bzl", "py_library")
             py_library(
                 name = "foo",
                 srcs = [
@@ -45,6 +46,7 @@ def pypi_archive(
             )
 
         BUILD:
+            load("//tools/skylark:py.bzl", "py_binary")
             py_binary(
                 name = "foobar",
                 deps = ["@foo//:foo"],

diff --git a/tools/workspace/semantic_version/package.BUILD.bazel b/tools/workspace/semantic_version/package.BUILD.bazel
@@ -1,5 +1,7 @@
 # -*- python -*-
 
+load("@drake//tools/skylark:py.bzl", "py_library")
+
 licenses(["notice"])  # BSD-2-Clause
 
 py_library(