fix(run-task): install repo requirements to user site dir

When using `pip` this is a no-op as `pip` already implicitly detects that the system site dir is not writeable and falls back to the user dir. For the `uv` case, this was never working and should get unblocked by this fix. Issue: #381
taskcluster · Oct 16, 2024 · 82f9abc · 82f9abc
1 parent c215560
commit 82f9abc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/taskgraph/run-task/run-task b/src/taskgraph/run-task/run-task
@@ -1010,11 +1010,11 @@ def install_pip_requirements(repositories):
     if not requirements:
         return
 
-    # TODO: Stop using system Python (#381)
     if shutil.which("uv"):
-        cmd = ["uv", "pip", "install", "--python", sys.executable, "--break-system-packages"]
+        user_site_dir = subprocess.run([sys.executable, "-msite", "--user-site"], capture_output=True, text=True).stdout.strip()
+        cmd = ["uv", "pip", "install", "--python", sys.executable, "--target", user_site_dir]
     else:
-        cmd = [sys.executable, "-mpip", "install", "--break-system-packages"]
+        cmd = [sys.executable, "-mpip", "install", "--user"]
 
     if os.environ.get("PIP_DISABLE_REQUIRE_HASHES") != "1":
         cmd.append("--require-hashes")

diff --git a/test/test_scripts_run_task.py b/test/test_scripts_run_task.py
@@ -1,5 +1,6 @@
 import io
 import os
+import site
 import stat
 import subprocess
 import sys
@@ -85,7 +86,7 @@ def test_install_pip_requirements(
             sys.executable,
             "-mpip",
             "install",
-            "--break-system-packages",
+            "--user",
             "--require-hashes",
             "-r",
             str(req),
@@ -105,7 +106,7 @@ def test_install_pip_requirements(
             sys.executable,
             "-mpip",
             "install",
-            "--break-system-packages",
+            "--user",
             "--require-hashes",
             "-r",
             str(req),
@@ -137,7 +138,8 @@ def test_install_pip_requirements_with_uv(
             "install",
             "--python",
             sys.executable,
-            "--break-system-packages",
+            "--target",
+            site.getusersitepackages(),
             "--require-hashes",
             "-r",
             str(req),