run_uv

Author: maurycy

dev.py

@@ -4,6 +4,7 @@
 import shutil
 import subprocess
 import sys
+from pyperformance import _utils
 
 REPO_ROOT = os.path.dirname(os.path.abspath(__file__))
 VENVS = os.path.join(REPO_ROOT, ".venvs")
@@ -38,27 +39,18 @@ def ensure_venv_ready(venvroot=None, kind="dev", venvsdir=VENVS):
         isready = os.path.exists(readyfile)
         if not isready:
             relroot = os.path.relpath(venvroot)
-            uv = shutil.which("uv")
-            if not uv:
-                sys.exit(
-                    "ERROR: uv executable not found. "
-                    "Install uv from https://astral.sh/uv and retry."
-                )
             if os.path.exists(venvroot):
                 print(f"uv env {relroot} not ready, re-creating...")
                 shutil.rmtree(venvroot)
             else:
                 print(f"creating uv env at {relroot}...")
-            result = subprocess.run(
-                [
-                    uv,
-                    "venv",
-                    "--python",
-                    sys.executable,
-                    venvroot,
-                ]
+            ec, _, _ = _utils.run_uv(
+                "venv",
+                "--python",
+                sys.executable,
+                venvroot,
             )
-            if result.returncode != 0:
+            if ec != 0:
                 sys.exit("ERROR: uv venv creation failed")
         else:
             assert os.path.exists(os.path.join(venvroot, "pyvenv.cfg"))
@@ -71,25 +63,16 @@ def ensure_venv_ready(venvroot=None, kind="dev", venvsdir=VENVS):
     if not isready:
         relroot = os.path.relpath(venvroot)
         print(f"uv env {relroot} not ready, installing dependencies...")
-        uv = shutil.which("uv")
-        if not uv:
-            sys.exit(
-                "ERROR: uv executable not found. "
-                "Install uv from https://astral.sh/uv and retry."
-            )
-        proc = subprocess.run(
-            [
-                uv,
-                "pip",
-                "install",
-                "--python",
-                python,
-                "--upgrade",
-                "--editable",
-                f"{REPO_ROOT}[dev]",
-            ],
+        ec, _, _ = _utils.run_uv(
+            "pip",
+            "install",
+            "--python",
+            python,
+            "--upgrade",
+            "--editable",
+            f"{REPO_ROOT}[dev]",
         )
-        if proc.returncode != 0:
+        if ec != 0:
             sys.exit("ERROR: uv pip install failed")
         with open(readyfile, "w"):
             pass

pyperformance/_utils.py

@@ -11,6 +11,8 @@
     "parse_name_pattern",
     "parse_selections",
     "parse_tag_pattern",
+    # tooling
+    "run_uv",
 ]
 
 
@@ -21,8 +23,8 @@
 import errno
 import os
 import os.path
-import shlex
 import shutil
+import shlex
 import subprocess
 import sys
 import tempfile
@@ -165,6 +167,15 @@ def run_python(*args, python=sys.executable, **kwargs):
     return run_cmd([python, *args], **kwargs)
 
 
+def run_uv(*args, env=None, capture=None, verbose=True):
+    uv = shutil.which("uv")
+    if not uv:
+        if verbose:
+            print("ERROR: uv executable not found. Install uv from https://astral.sh/uv.")
+        return 127, None, None
+    return run_cmd([uv, *args], env=env, capture=capture, verbose=verbose)
+
+
 #######################################
 # network utils
 

pyperformance/_venv.py

@@ -112,10 +112,6 @@ def create_venv(
 ):
     """Create a new venv at the given root, optionally installing pip."""
     already_existed = os.path.exists(root)
-    uv = shutil.which("uv")
-    if not uv:
-        print("ERROR: uv executable not found. Install uv from https://astral.sh/uv.")
-        raise VenvCreationFailedError(root, 127, already_existed)
 
     if isinstance(python, str) or python is None:
         target_python = python or sys.executable
@@ -125,11 +121,12 @@ def create_venv(
         except AttributeError as exc:
             raise TypeError(f"expected python str, got {python!r}") from exc
 
-    argv = [uv, "venv"]
-    if target_python:
-        argv.extend(["--python", target_python])
-    argv.append(root)
-    ec, _, _ = _utils.run_cmd(argv, env=env)
+    args = [
+        "venv",
+        *( ["--python", target_python] if target_python else [] ),
+        root,
+    ]
+    ec, _, _ = _utils.run_uv(*args, env=env)
     if ec != 0:
         if cleanonfail and not already_existed:
             _utils.safe_rmtree(root)