Remove dependency on pybind11 in favor of rules_python.

Per 1c23deb, we don't actually use pybind11 except for the convenient "@local_config_python" label. This was removed from pybind11_bazel in favor of the one provided by rules_python: pybind/pybind11_bazel#72 We can remove this extra dependency and do the same.
hdl · Jun 26, 2024 · ff83240 · ff83240
1 parent 8044239
commit ff83240
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 86 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -167,7 +167,7 @@ dependency_support()
 
 load("//:init.bzl", "init")
 
-init(python_interpreter_target = "@python39_host//:python")
+init()
 
 load("@rules_python//python:pip.bzl", "pip_parse")
 

diff --git a/dependency_support/boost/add_python.patch b/dependency_support/boost/add_python.patch
@@ -57,7 +57,7 @@ index e5d0b60..4f52d3c 100644
 +        ":tuple",
 +        ":type",
 +        ":utility",
-+        "@local_config_python//:python_headers",
++        "@rules_python//python/cc:current_py_cc_headers",
 +    ],
 +    copts = ["-w"],
 +)
diff --git a/dependency_support/com_github_yosyshq_nextpnr/bundled.BUILD.bazel b/dependency_support/com_github_yosyshq_nextpnr/bundled.BUILD.bazel
@@ -42,8 +42,8 @@ DEPS = [
     "@boost//:python",
     "@boost//:system",
     "@boost//:thread",
-    "@local_config_python//:python_headers",
     "@eigen//:eigen3",
+    "@rules_python//python/cc:current_py_cc_headers",
 ]
 
 DEFINES = [

diff --git a/dependency_support/com_github_yosyshq_prjtrellis/bundled.BUILD.bazel b/dependency_support/com_github_yosyshq_prjtrellis/bundled.BUILD.bazel
@@ -49,7 +49,7 @@ DEPS = [
     "@boost//:system",
     "@boost//:thread",
     "@com_google_absl//absl/strings",
-    "@local_config_python//:python_headers",
+    "@rules_python//python/cc:current_py_cc_headers",
 ]
 
 COPTS = [

diff --git a/dependency_support/dependency_support.bzl b/dependency_support/dependency_support.bzl
@@ -61,7 +61,6 @@ load("@rules_hdl//dependency_support/org_theopenroadproject_asap7_pdk_r1p7:org_t
 load("@rules_hdl//dependency_support/org_theopenroadproject_asap7sc6t_26:org_theopenroadproject_asap7sc6t_26.bzl", "org_theopenroadproject_asap7sc6t_26")
 load("@rules_hdl//dependency_support/org_theopenroadproject_asap7sc7p5t_27:org_theopenroadproject_asap7sc7p5t_27.bzl", "org_theopenroadproject_asap7sc7p5t_27")
 load("@rules_hdl//dependency_support/org_theopenroadproject_asap7sc7p5t_28:org_theopenroadproject_asap7sc7p5t_28.bzl", "org_theopenroadproject_asap7sc7p5t_28")
-load("@rules_hdl//dependency_support/pybind11:pybind11.bzl", "pybind11")
 load("@rules_hdl//dependency_support/rules_license:rules_license.bzl", "rules_license")
 load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
 load("@rules_hdl//dependency_support/verilator:verilator.bzl", "verilator")
@@ -116,7 +115,6 @@ def dependency_support(register_toolchains = True):
     org_theopenroadproject_asap7sc6t_26()
     org_theopenroadproject_asap7sc7p5t_27()
     org_theopenroadproject_asap7sc7p5t_28()
-    pybind11()
     rules_license()
     tk_tcl()
     verilator()

diff --git a/dependency_support/pybind11/BUILD b/dependency_support/pybind11/BUILD
diff --git a/dependency_support/pybind11/init_pybind11.bzl b/dependency_support/pybind11/init_pybind11.bzl
diff --git a/dependency_support/pybind11/pybind11.bzl b/dependency_support/pybind11/pybind11.bzl
diff --git a/init.bzl b/init.bzl
@@ -23,7 +23,6 @@ load(
 )
 load("//dependency_support:requirements.bzl", install_pip_deps = "install_deps")
 load("//dependency_support/boost:init_boost.bzl", "init_boost")
-load("//dependency_support/pybind11:init_pybind11.bzl", "init_pybind11")
 
 def init(python_interpreter = None, python_interpreter_target = None):
     """Initializes the bazel_rules_hdl workspace.
@@ -59,7 +58,6 @@ def init(python_interpreter = None, python_interpreter_target = None):
     install_pip_deps(**install_deps_kwargs)
 
     init_boost()
-    init_pybind11(python_interpreter_target = python_interpreter_target)
 
     protobuf_deps()