feat: use host interpret from rules_python

oxidase · Jul 4, 2024 · f6e784e · f6e784e
1 parent 0dea015
commit f6e784e
Show file tree

Hide file tree

Showing 31 changed files with 204 additions and 129 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,7 +1,7 @@
 startup --windows_enable_symlinks
 common --enable_bzlmod
-query --deleted_packages=examples/simple,examples/torch,examples/transitions,examples/markers,examples/aspect_rules_py,examples/cc_toolchain,examples/workspace,examples/workspace_rules_python
-build --deleted_packages=examples/simple,examples/torch,examples/transitions,examples/markers,examples/aspect_rules_py,examples/cc_toolchain,examples/workspace,examples/workspace_rules_python
+query --deleted_packages=examples/simple,examples/torch,examples/transitions,examples/markers,examples/aspect_rules_py,examples/cc_toolchain,examples/workspace,examples/workspace_multi
+build --deleted_packages=examples/simple,examples/torch,examples/transitions,examples/markers,examples/aspect_rules_py,examples/cc_toolchain,examples/workspace,examples/workspace_multi
 build --enable_runfiles
 build --incompatible_default_to_explicit_init_py
 test --test_output=errors
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -4,9 +4,12 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.7.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
-internal_deps = use_extension("@rules_ophiuchus//python:extensions.bzl", "internal_deps")
-use_repo(internal_deps, "rules_ophiuchus_pip", "rules_ophiuchus_poetry_deps")
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+use_repo(python, "python_3_11_host")
+
+internal_deps = use_extension("@rules_ophiuchus//python:internal_deps.bzl", "internal_deps")
+use_repo(internal_deps, "rules_ophiuchus_defs", "rules_ophiuchus_pip", "rules_ophiuchus_poetry_deps")
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This allows to use platform information of resolved Python toolchains and build
 
 Minimum requirements:
 
-* Bazel 6.x
+* Bazel 6.x and rules_python with registered Python >= 3.11 toolchain.
 
 ## Getting started
 
@@ -17,7 +17,7 @@ Minimum requirements:
 To import `rules_ophiuchus` in your project, you first need to add it to your `MODULE.bazel` file
 
 ```python
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(python_version = "3.12")

diff --git a/examples/BUILD b/examples/BUILD
@@ -12,5 +12,5 @@
     "torch",
     "transitions",
     "workspace",
-    "workspace_rules_python",
+    "workspace_multi",
 ]]
diff --git a/examples/aspect_rules_py/MODULE.bazel b/examples/aspect_rules_py/MODULE.bazel
@@ -4,7 +4,7 @@ module(
 )
 
 bazel_dep(name = "aspect_rules_py", version = "0.7.3")
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 # Register a hermetic Python toolchain rather than rely on a locally-installed
 # interpreter.

diff --git a/examples/cc_toolchain/MODULE.bazel b/examples/cc_toolchain/MODULE.bazel
@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(python_version = "3.12")

diff --git a/examples/markers/.bazelversion b/examples/markers/.bazelversion
@@ -1 +1 @@
-last_downstream_green
+last_green
diff --git a/examples/markers/MODULE.bazel b/examples/markers/MODULE.bazel
@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 python_version = "3_12"
 

diff --git a/examples/simple/MODULE.bazel b/examples/simple/MODULE.bazel
@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(python_version = "3.12")

diff --git a/examples/simple/poetry.lock b/examples/simple/poetry.lock
diff --git a/examples/torch/MODULE.bazel b/examples/torch/MODULE.bazel
@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_python", version = "0.32.2")
+bazel_dep(name = "rules_python", version = "0.33.2")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(python_version = "3.12")

diff --git a/examples/torch/poetry.lock b/examples/torch/poetry.lock
diff --git a/examples/transitions/MODULE.bazel b/examples/transitions/MODULE.bazel
@@ -1,5 +1,5 @@
-bazel_dep(name = "rules_python", version = "0.32.2")
-bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "rules_python", version = "0.33.2")
+bazel_dep(name = "platforms", version = "0.0.10")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(python_version = "3.12")

diff --git a/examples/workspace/README.md b/examples/workspace/README.md
@@ -4,12 +4,15 @@ Explicitly set `--enable_bzlmod=false` to disable bzlmod.
 
 Add rules_ophiuchus to `WORKSPACE` file as
 ```
-load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 load("@rules_ophiuchus//python:repositories.bzl", install_poetry_dependencies = "install_dependencies")
 
-install_poetry_dependencies()
+install_poetry_dependencies("black_mamba", "3.11")
+
+load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
+
 poetry_parse(
     name = "poetry",
     lock = "//:poetry.lock",
 )
 ```
+where `black_mamba` and 3.11 are toolchain name and version for lock files processing.
diff --git a/examples/workspace/WORKSPACE b/examples/workspace/WORKSPACE
@@ -1,12 +1,28 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_python",
+    sha256 = "e3f1cc7a04d9b09635afb3130731ed82b5f58eadc8233d4efb59944d92ffc06f",
+    strip_prefix = "rules_python-0.33.2",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.33.2/rules_python-0.33.2.tar.gz",
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
+
+py_repositories()
+
+python_register_toolchains("black_mamba", "3.11")
+
 local_repository(
     name = "rules_ophiuchus",
     path = "../..",
 )
 
-load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 load("@rules_ophiuchus//python:repositories.bzl", install_poetry_dependencies = "install_dependencies")
 
-install_poetry_dependencies()
+install_poetry_dependencies("black_mamba", "3.11")
+
+load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 
 poetry_parse(
     name = "poetry",

diff --git a/examples/workspace_rules_python/.bazelrc → examples/workspace_multi/.bazelrc b/examples/workspace_rules_python/.bazelrc → examples/workspace_multi/.bazelrc
diff --git a/...ples/workspace_rules_python/.bazelversion → examples/workspace_multi/.bazelversion b/...ples/workspace_rules_python/.bazelversion → examples/workspace_multi/.bazelversion
diff --git a/examples/workspace_rules_python/BUILD → examples/workspace_multi/BUILD b/examples/workspace_rules_python/BUILD → examples/workspace_multi/BUILD
@@ -1,8 +1,8 @@
-load("@python//3.12:defs.bzl", py_test_3_12 = "py_test")
-load("@python//3.11:defs.bzl", py_test_3_11 = "py_test")
-load("@python//3.10:defs.bzl", py_test_3_10 = "py_test")
-load("@python//3.9:defs.bzl", py_test_3_9 = "py_test")
-load("@python//3.8:defs.bzl", py_test_3_8 = "py_test")
+load("@copperhead//3.10:defs.bzl", py_test_3_10 = "py_test")
+load("@copperhead//3.11:defs.bzl", py_test_3_11 = "py_test")
+load("@copperhead//3.12:defs.bzl", py_test_3_12 = "py_test")
+load("@copperhead//3.8:defs.bzl", py_test_3_8 = "py_test")
+load("@copperhead//3.9:defs.bzl", py_test_3_9 = "py_test")
 
 [
     py_test(

diff --git a/examples/workspace_rules_python/README.md → examples/workspace_multi/README.md b/examples/workspace_rules_python/README.md → examples/workspace_multi/README.md
@@ -4,12 +4,21 @@ Explicitly set `--enable_bzlmod=false` to disable bzlmod.
 
 Add rules_ophiuchus to `WORKSPACE` file as
 ```
-load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 load("@rules_ophiuchus//python:repositories.bzl", install_poetry_dependencies = "install_dependencies")
 
-install_poetry_dependencies()
+install_poetry_dependencies("copperhead_3_11", "3.11")
+
+load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
+
 poetry_parse(
-    name = "poetry",
+    name = "poetry_repo1",
+    lock = "//:poetry.lock",
+)
+
+poetry_parse(
+    name = "poetry_repo2",
     lock = "//:poetry.lock",
 )
 ```
+
+where `copperhead_3_11` and 3.11 are toolchain name and version for lock files processing.
diff --git a/examples/workspace_rules_python/WORKSPACE → examples/workspace_multi/WORKSPACE b/examples/workspace_rules_python/WORKSPACE → examples/workspace_multi/WORKSPACE
@@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_python",
-    sha256 = "4912ced70dc1a2a8e4b86cec233b192ca053e82bc72d877b98e126156e8f228d",
-    strip_prefix = "rules_python-0.32.2",
-    url = "https://github.com/bazelbuild/rules_python/releases/download/0.32.2/rules_python-0.32.2.tar.gz",
+    sha256 = "e3f1cc7a04d9b09635afb3130731ed82b5f58eadc8233d4efb59944d92ffc06f",
+    strip_prefix = "rules_python-0.33.2",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.33.2/rules_python-0.33.2.tar.gz",
 )
 
 load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_multi_toolchains")
@@ -20,7 +20,7 @@ python_versions = [
 ]
 
 python_register_multi_toolchains(
-    name = "python",
+    name = "copperhead",
     default_version = python_versions[0],
     python_versions = python_versions,
     register_coverage_tool = True,
@@ -31,10 +31,11 @@ local_repository(
     path = "../..",
 )
 
-load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 load("@rules_ophiuchus//python:repositories.bzl", install_poetry_dependencies = "install_dependencies")
 
-install_poetry_dependencies()
+install_poetry_dependencies("copperhead_3_11", "3.11")
+
+load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 
 poetry_parse(
     name = "poetry_repo1",

diff --git a/examples/workspace_rules_python/poetry.lock → examples/workspace_multi/poetry.lock b/examples/workspace_rules_python/poetry.lock → examples/workspace_multi/poetry.lock
diff --git a/...les/workspace_rules_python/pyproject.toml → examples/workspace_multi/pyproject.toml b/...les/workspace_rules_python/pyproject.toml → examples/workspace_multi/pyproject.toml
diff --git a/examples/workspace_rules_python/test.py → examples/workspace_multi/test.py b/examples/workspace_rules_python/test.py → examples/workspace_multi/test.py
diff --git a/python/extensions.bzl b/python/extensions.bzl
@@ -1,4 +1,3 @@
-load("@rules_ophiuchus//python:repositories.bzl", "install_dependencies")
 load("@rules_ophiuchus//python:poetry_parse.bzl", "poetry_parse")
 
 def _poetry_impl(module_ctx):
@@ -24,13 +23,3 @@ poetry = module_extension(
         ),
     },
 )
-
-def _internal_deps_impl(module_ctx):
-    install_dependencies()
-
-internal_deps = module_extension(
-    implementation = _internal_deps_impl,
-    tag_classes = {
-        "install": tag_class(dict()),
-    },
-)
diff --git a/python/internal_deps.bzl b/python/internal_deps.bzl
@@ -0,0 +1,11 @@
+load("@rules_ophiuchus//python:repositories.bzl", "install_dependencies")
+
+def _internal_deps_impl(module_ctx):
+    install_dependencies("python_3_11", "3.11")
+
+internal_deps = module_extension(
+    implementation = _internal_deps_impl,
+    tag_classes = {
+        "install": tag_class(dict()),
+    },
+)
diff --git a/python/poetry.bzl b/python/poetry.bzl
@@ -1,7 +1,9 @@
-load("@rules_ophiuchus_poetry_deps//:defs.bzl", _python = "python")
 load("//python/private:poetry_deps.bzl", _get_imports = "get_imports")
 
 def _poetry_update_impl(ctx):
+    python_toolchain = ctx.toolchains["@bazel_tools//tools/python:toolchain_type"]
+    runtime_info = python_toolchain.py3_runtime
+
     script = """#!{python}
 
 import runpy
@@ -23,7 +25,7 @@ if __name__ == "__main__":
     sys.argv = [sys.argv[0], "lock", f"--directory={{dir}}"{update}, *sys.argv[1:]]
     runpy.run_module("poetry", run_name="__main__", alter_sys=True)
 """.format(
-        python = _python,
+        python = runtime_info.interpreter.short_path,
         deps = repr(["../{}".format(path) for path in _get_imports(ctx.attr._poetry_deps).to_list()]),
         toml = ctx.attr.toml.files.to_list().pop().short_path,
         lock = ctx.attr.lock.files.to_list().pop().short_path,
@@ -32,7 +34,7 @@ if __name__ == "__main__":
 
     output = ctx.actions.declare_file(ctx.label.name + ".update")
     ctx.actions.write(output, script, is_executable = True)
-    runfiles = ctx.runfiles(ctx.attr.toml.files.to_list() + ctx.attr.lock.files.to_list())
+    runfiles = ctx.runfiles(transitive_files = depset(transitive = [ctx.attr.toml.files, ctx.attr.lock.files, runtime_info.files]))
     runfiles = runfiles.merge(ctx.attr._poetry_deps.default_runfiles)
 
     return [
@@ -48,4 +50,7 @@ poetry_update = rule(
         "update": attr.bool(default = True),
         "_poetry_deps": attr.label(default = "@rules_ophiuchus_poetry_deps//:pkg"),
     },
+    toolchains = [
+        "@bazel_tools//tools/python:toolchain_type",
+    ],
 )