[NO TESTS] WIP

Author: arrdem

MODULE.bazel

@@ -12,7 +12,7 @@ module(
 # py_image_layer requires 2.x for the `tar` rule.
 # py_image_layer needs compute_unused_inputs attribute
 # py_image_layer needs repo_mapping fix.
-bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
+bazel_dep(name = "aspect_bazel_lib", version = version = "2.15.3")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
 bazel_dep(name = "rules_python", version = "0.29.0")
 bazel_dep(name = "platforms", version = "0.0.7")

py/private/py_venv.bzl

@@ -19,6 +19,11 @@ def _dict_to_exports(env):
         for (k, v) in env.items()
     ]
 
+def _interpreter_flags(ctx):
+    py_toolchain = _py_semantics.resolve_toolchain(ctx)
+
+    return [it for it in py_toolchain.flags + ctx.attr.interpreter_options if it not in ["-I"]]
+
 # FIXME: This is derived directly from the py_binary.bzl rule and should really
 # be a layer on top of it if we can figure out flowing the data around. This is
 # PoC quality.
@@ -137,7 +142,7 @@ def _py_venv_rule_impl(ctx):
         output = ctx.outputs.executable,
         substitutions = {
             "{{BASH_RLOCATION_FN}}": BASH_RLOCATION_FUNCTION.strip(),
-            "{{INTERPRETER_FLAGS}}": " ".join(py_toolchain.flags + ctx.attr.interpreter_options),
+            "{{INTERPRETER_FLAGS}}": " ".join(_interpreter_flags(ctx)),
             "{{ENTRYPOINT}}": "${VIRTUAL_ENV}/bin/python",
             "{{ARG_VENV}}": to_rlocation_path(ctx, venv_dir),
         },
@@ -204,7 +209,7 @@ def _py_venv_binary_impl(ctx):
         output = ctx.outputs.executable,
         substitutions = {
             "{{BASH_RLOCATION_FN}}": BASH_RLOCATION_FUNCTION.strip(),
-            "{{INTERPRETER_FLAGS}}": " ".join(py_toolchain.flags + ctx.attr.interpreter_options),
+            "{{INTERPRETER_FLAGS}}": " ".join(_interpreter_flags(ctx)),
             "{{ENTRYPOINT}}": to_rlocation_path(ctx, ctx.file.main),
             "{{ARG_VENV}}": to_rlocation_path(ctx, venv_dir),
             "{{RUNFILES_INTERPRETER}}": str(py_toolchain.runfiles_interpreter).lower(),

py/tests/py-external-venv/test.py

@@ -4,11 +4,22 @@
 import sys
 import site
 
+print("---")
+print("__file__:", __file__)
+print("sys.prefix:", sys.prefix)
+print("sys.executable:", sys.executable)
+print("site.PREFIXES:")
+for p in site.PREFIXES:
+    print(" -", p)
+
 # The virtualenv module should have already been loaded at interpreter startup
 assert "_virtualenv" in sys.modules
 
-print(__file__)
-print(sys.prefix)
-print(sys.executable)
-for p in site.PREFIXES:
-    print(" -", p)
+# The virtualenv changes the sys.prefix, which should be in our runfiles
+assert sys.prefix.endswith(".runfiles/aspect_rules_py/py/tests/py-external-venv/.venv")
+
+# That prefix should also be "the" prefix per site.PREFIXES
+assert site.PREFIXES[0].endswith(".runfiles/aspect_rules_py/py/tests/py-external-venv/.venv")
+
+# The virtualenv also changes the sys.executable (if we've done this right)
+assert sys.executable.find("aspect_rules_py/py/tests/py-external-venv/.venv/bin/python") != -1

py/tests/py-internal-venv/test.py

@@ -4,11 +4,22 @@
 import sys
 import site
 
+print("---")
+print("__file__:", __file__)
+print("sys.prefix:", sys.prefix)
+print("sys.executable:", sys.executable)
+print("site.PREFIXES:")
+for p in site.PREFIXES:
+    print(" -", p)
+
 # The virtualenv module should have already been loaded at interpreter startup
 assert "_virtualenv" in sys.modules
 
-print(__file__)
-print(sys.prefix)
-print(sys.executable)
-for p in site.PREFIXES:
-    print(" -", p)
+# The virtualenv changes the sys.prefix, which should be in our runfiles
+assert sys.prefix.endswith(".runfiles/aspect_rules_py/py/tests/py-internal-venv/.venv_test")
+
+# That prefix should also be "the" prefix per site.PREFIXES
+assert site.PREFIXES[0].endswith(".runfiles/aspect_rules_py/py/tests/py-internal-venv/.venv_test")
+
+# The virtualenv also changes the sys.executable (if we've done this right)
+assert sys.executable.find("aspect_rules_py/py/tests/py-internal-venv/.venv_test/bin/python") != -1

py/tools/venv_bin/src/main.rs

@@ -75,13 +75,14 @@ struct VenvArgs {
     /// dynamic. Allows us to use the same tool statically as dynamically, which
     /// may or may not be a feature.
     #[arg(long)]
+    #[clap(default_value = "dynamic-symlink")]
     mode: VenvMode,
 
     /// The interpreter version. Must be supplied because there are parts of the
     /// venv whose path depend on the precise interpreter version. To be sourced from
     /// PyRuntimeInfo.
     #[arg(long)]
-    version: String,
+    version: Option<String>,
 }
 
 fn venv_cmd_handler(args: VenvArgs) -> miette::Result<()> {
@@ -97,7 +98,7 @@ fn venv_cmd_handler(args: VenvArgs) -> miette::Result<()> {
         VenvMode::StaticSymlink => {
             let venv = py::venv::create_empty_venv(
                 &args.python,
-                py::venv::PythonVersionInfo::from_str(&args.version)?,
+                py::venv::PythonVersionInfo::from_str(&args.version.unwrap())?,
                 &args.location,
                 &args.env_file,
             )?;
@@ -114,7 +115,7 @@ fn venv_cmd_handler(args: VenvArgs) -> miette::Result<()> {
         VenvMode::StaticPth => {
             let venv = py::venv::create_empty_venv(
                 &args.python,
-                py::venv::PythonVersionInfo::from_str(&args.version)?,
+                py::venv::PythonVersionInfo::from_str(&args.version.unwrap())?,
                 &args.location,
                 &args.env_file,
             )?;