Add uv to runtime, modify scratch install

Author: DiamondJoseph

Dockerfile

@@ -44,6 +44,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-ins
     libnss-ldapd \
     && apt-get dist-clean
 
+# Install uv to allow setup-scratch to run
+COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /uvx /bin/
+
 # For this pod to understand finding user information from LDAP
 RUN sed -i 's/files/ldap files/g' /etc/nsswitch.conf
 

src/blueapi/cli/scratch.py

@@ -47,7 +47,7 @@ def setup_scratch(
     for repo in config.repositories:
         local_directory = config.root / repo.name
         ensure_repo(repo.remote_url, local_directory)
-        scratch_install(local_directory, timeout=install_timeout)
+        scratch_install(repo.name, local_directory, timeout=install_timeout)
 
 
 def ensure_repo(remote_url: str, local_directory: Path) -> None:
@@ -76,7 +76,9 @@ def ensure_repo(remote_url: str, local_directory: Path) -> None:
         )
 
 
-def scratch_install(path: Path, timeout: float = _DEFAULT_INSTALL_TIMEOUT) -> None:
+def scratch_install(
+    name: str, path: Path, timeout: float = _DEFAULT_INSTALL_TIMEOUT
+) -> None:
     """
     Install a scratch package. Make blueapi aware of a repository checked out in
     the scratch area. Make it automatically follow code changes to that repository
@@ -91,17 +93,7 @@ def scratch_install(path: Path, timeout: float = _DEFAULT_INSTALL_TIMEOUT) -> No
     _validate_directory(path)
 
     logging.info(f"Installing {path}")
-    process = Popen(
-        [
-            "python",
-            "-m",
-            "pip",
-            "install",
-            "--no-deps",
-            "-e",
-            str(path),
-        ]
-    )
+    process = Popen(["uv", "add", "--locked", "--editable", f"{name} @ {path}"])
     process.wait(timeout=timeout)
     if process.returncode != 0:
         raise RuntimeError(f"Failed to install {path}: Exit Code: {process.returncode}")

tests/unit_tests/cli/test_scratch.py

@@ -62,29 +62,21 @@ def test_scratch_install_installs_path(
     mock_process.returncode = 0
     mock_popen.return_value = mock_process
 
-    scratch_install(directory_path_with_sgid, timeout=1.0)
+    scratch_install("foo", directory_path_with_sgid, timeout=1.0)
 
     mock_popen.assert_called_once_with(
-        [
-            "python",
-            "-m",
-            "pip",
-            "install",
-            "--no-deps",
-            "-e",
-            str(directory_path_with_sgid),
-        ]
+        ["uv", "add", "--locked", "--editable", f"foo @ {directory_path_with_sgid}"]
     )
 
 
 def test_scratch_install_fails_on_file(file_path: Path):
     with pytest.raises(KeyError):
-        scratch_install(file_path, timeout=1.0)
+        scratch_install("foo", file_path, timeout=1.0)
 
 
 def test_scratch_install_fails_on_nonexistant_path(nonexistant_path: Path):
     with pytest.raises(KeyError):
-        scratch_install(nonexistant_path, timeout=1.0)
+        scratch_install("foo", nonexistant_path, timeout=1.0)
 
 
 @patch("blueapi.cli.scratch.Popen")
@@ -99,7 +91,7 @@ def test_scratch_install_fails_on_non_zero_exit_code(
     mock_popen.return_value = mock_process
 
     with pytest.raises(RuntimeError):
-        scratch_install(directory_path_with_sgid, timeout=1.0)
+        scratch_install("foo", directory_path_with_sgid, timeout=1.0)
 
 
 @patch("blueapi.cli.scratch.Repo")
@@ -270,8 +262,8 @@ def test_setup_scratch_iterates_repos(
 
     mock_scratch_install.assert_has_calls(
         [
-            call(directory_path_with_sgid / "foo", timeout=120.0),
-            call(directory_path_with_sgid / "bar", timeout=120.0),
+            call("foo", directory_path_with_sgid / "foo", timeout=120.0),
+            call("bar", directory_path_with_sgid / "bar", timeout=120.0),
         ]
     )