From 826d8b67d75c9bce0a4751859cec6f5ca5fbb4c1 Mon Sep 17 00:00:00 2001
From: Dawn <jiaxin.duan@psi.ch>
Date: Tue, 27 Oct 2026 11:11:32 +0100
Subject: [PATCH] crystfel: default uv to /usr/bin/uv (system package on Ra)

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 crystfel/README.md | 2 +-
 crystfel/build     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crystfel/README.md b/crystfel/README.md
index 11ef699..06d8b33 100644
--- a/crystfel/README.md
+++ b/crystfel/README.md
@@ -22,7 +22,7 @@ too old and the system python is 3.9 (EOL, meson >= 1.12 needs >= 3.10).
 `uv sync --locked` into a throwaway venv in the build scratch dir, on a
 uv-managed Python 3.12 (downloaded on first use, also into scratch). Nothing of
 this lands in `$PREFIX`. `uv` must be on the build host (default
-`~/.local/bin/uv`, `pip3 install --user uv`; override with `UV=/path/to/uv`).
+`/usr/bin/uv`; override with `UV=/path/to/uv`).
 Wheel cache is the shared `/opt/psi/MX/.uv-cache` (home quota).
 
 **HDF5 is bundled.** The Ra build node has no `hdf5-devel`, no `h5cc` and no
diff --git a/crystfel/build b/crystfel/build
index 6765f56..9b7f7b9 100755
--- a/crystfel/build
+++ b/crystfel/build
@@ -20,8 +20,8 @@
 # wrong cwd silently builds nothing (modbuild has no errexit in hooks).
 
 crystfel::env() {
-    # modbuild's shell strips ~/.local/bin from PATH; override with UV=/path/to/uv if needed
-    UV="${UV:-$HOME/.local/bin/uv}"
+    # system uv on Ra; override with UV=/path/to/uv if needed
+    UV="${UV:-/usr/bin/uv}"
     # ~/.cache/uv hits the home disk quota; shared cache reuses wheels across MX builds
     export UV_CACHE_DIR="/opt/psi/MX/.uv-cache"
     export UV_PROJECT_ENVIRONMENT="${SRC_DIR}/../meson-venv"
@@ -33,7 +33,7 @@ crystfel::env() {
 
 pbuild::configure() {
     crystfel::env
-    [[ -x "$UV" ]] || std::die 42 "uv not found at $UV - run: pip3 install --user uv  (or set UV=/path/to/uv)"
+    [[ -x "$UV" ]] || std::die 42 "uv not found at $UV - dnf install uv, or set UV=/path/to/uv"
     for t in flex bison make; do
         command -v "$t" >/dev/null || std::die 42 "$t not on PATH - crystfel/hdf5 need it (dnf install $t)"
     done