use in-house unpacker

Author: thesayyn

py/tools/py/src/unpack.rs

@@ -6,6 +6,11 @@ use std::{
 
 use miette::{miette, IntoDiagnostic, Result};
 
+const RELOCATABLE_SHEBANG: &'static str = r#"/bin/sh
+'''exec' "$(dirname -- "$(realpath -- "$0")")"/'python3' "$0" "$@"
+' '''
+"#;
+
 pub fn unpack_wheel(version: &str, location: &Path, wheel: &Path) -> Result<()> {
     let python_version: uv_python::PythonVersion = version
         .parse()
@@ -36,12 +41,12 @@ pub fn unpack_wheel(version: &str, location: &Path, wheel: &Path) -> Result<()>
     };
 
     let layout = uv_install_wheel::Layout {
-        sys_executable: PathBuf::new(),
+        sys_executable: PathBuf::from(RELOCATABLE_SHEBANG),
         python_version: (python_version.major(), python_version.minor()),
         // Don't stamp in the path to the interpreter into the generated bins
         // as we don't want an absolute path here.
         // Perhaps this should be set to just "python" so it picks up the one in the venv path?
-        os_name: "/bin/false".to_string(),
+        os_name: "".to_string(),
         scheme,
     };
 

uv/private/whl_install/rule.bzl

@@ -3,14 +3,12 @@ Installing wheels as a Bazel build action, rather than a repo step.
 """
 
 load("@rules_python//python:defs.bzl", "PyInfo")
+load("//py/private/toolchain:types.bzl", "PY_TOOLCHAIN", "UNPACK_TOOLCHAIN")
 
-PYTHON_TOOLCHAIN_TYPE = "@rules_python//python:toolchain_type"
-UV_TOOLCHAIN = "@multitool//tools/uv:toolchain_type"
 
 def _whl_install(ctx):
-    py_toolchain = ctx.toolchains[PYTHON_TOOLCHAIN_TYPE].py3_runtime
-    uv = ctx.toolchains[UV_TOOLCHAIN]
-
+    py_toolchain = ctx.toolchains[PY_TOOLCHAIN].py3_runtime
+    unpack_toolchain = ctx.toolchains[UNPACK_TOOLCHAIN]
     install_dir = ctx.actions.declare_directory(
         "install",
     )
@@ -24,25 +22,28 @@ def _whl_install(ctx):
     #
     # Could probably use bsdtar here rather than non-hermetic unzip.
 
+
     # FIXME: Need the Python toolchain here?
     archive = ctx.attr.src[DefaultInfo].files.to_list()[0]
+
+    arguments = ctx.actions.args()
+    arguments.add_all([
+        "--into",
+        install_dir.path,
+        "--wheel",
+        archive.path,
+        "--python-version",
+        "{}.{}.{}".format(
+            py_toolchain.interpreter_version_info.major,
+            py_toolchain.interpreter_version_info.minor,
+            py_toolchain.interpreter_version_info.micro,
+        ),
+    ])
+
     ctx.actions.run(
-        executable = uv.executable,
-        arguments = [
-            "pip",
-            "install",
-            "--no-deps",
-            # FIXME: What happens when this is a TreeArtifact?
-            "--prefix",
-            install_dir.path,
-            "--python",
-            py_toolchain.interpreter.path,
-            archive.path,
-        ],
-        inputs = [
-            archive,
-            uv.executable,
-        ] + py_toolchain.files.to_list(),
+        executable = unpack_toolchain.bin.bin,
+        arguments = [arguments],
+        inputs = [archive],
         outputs = [
             install_dir,
         ],
@@ -83,8 +84,8 @@ whl_install = rule(
         "src": attr.label(doc = ""),
     },
     toolchains = [
-        PYTHON_TOOLCHAIN_TYPE,
-        UV_TOOLCHAIN,
+        PY_TOOLCHAIN,
+        UNPACK_TOOLCHAIN,
     ],
     provides = [
         DefaultInfo,