fix usage of uv binary

Author: blink1073

.evergreen/run-tests.sh

@@ -25,14 +25,17 @@ else
   exit 1
 fi
 
+. $ROOT/.evergreen/utils.sh
+UV=$(get_uv)
+
 # List the packages.
-uv sync ${UV_ARGS} --reinstall
-uv pip list
+$UV sync ${UV_ARGS} --reinstall
+$UV pip list
 
 # Ensure we go back to base environment after the test.
 trap "uv sync" EXIT HUP
 
 # Start the test runner.
-uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
+$UV run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 
 popd

.evergreen/scripts/install-dependencies.sh

@@ -38,6 +38,22 @@ function _pip_install() {
 }
 
 
+# Try to use the binaries in the toolchain if available.
+if [ -n "${CI}" ]; then
+  export PATH
+  case "${OSTYPE:?}" in
+  cygwin)
+    PATH="/cygdrive/c/Python/Current/Scripts:${PATH:-}"
+    ;;
+  darwin*)
+    PATH="/Library/Frameworks/Python.Framework/Versions/Current/bin:${PATH:-}"
+    ;;
+  *)
+    PATH="/opt/python/Current/bin:${PATH:-}"
+    ;;
+  esac
+fi
+
 # Ensure just is installed.
 if ! command -v just >/dev/null 2>&1; then
   # On most systems we can install directly.

.evergreen/scripts/run-server.sh

@@ -10,4 +10,7 @@ if [ -f $HERE/env.sh ]; then
   source $HERE/env.sh
 fi
 
-uv run $HERE/run_server.py "$@"
+. $ROOT/.evergreen/utils.sh
+UV=$(get_uv)
+
+$UV run $HERE/run_server.py "$@"

.evergreen/scripts/setup-dev-env.sh

@@ -16,22 +16,6 @@ if [ -f $HERE/test-env.sh ]; then
   . $HERE/test-env.sh
 fi
 
-# Try to use the binaries in the toolchain if available.
-if [ -n "${CI}" ]; then
-  export PATH
-  case "${OSTYPE:?}" in
-  cygwin)
-    PATH="/cygdrive/c/Python/Current:${PATH:-}"
-    ;;
-  darwin*)
-    PATH="/Library/Frameworks/Python.Framework/Versions/Current/bin:${PATH:-}"
-    ;;
-  *)
-    PATH="/opt/python/Current/bin:${PATH:-}"
-    ;;
-  esac
-fi
-
 # Ensure dependencies are installed.
 bash $HERE/install-dependencies.sh
 
@@ -63,13 +47,15 @@ if [ -f $HOME/.visualStudioEnv.sh ]; then
   SSH_TTY=1 source $HOME/.visualStudioEnv.sh
   set -u
 fi
-uv sync --frozen
+
+UV=$(get_uv)
+$UV sync --frozen
 
 echo "Setting up python environment... done."
 
 # Ensure there is a pre-commit hook if there is a git checkout.
 if [ -d .git ] && [ ! -f .git/hooks/pre-commit ]; then
-    uv run --frozen pre-commit install
+    $UV run --frozen pre-commit install
 fi
 
 popd > /dev/null

.evergreen/scripts/setup-tests.sh

@@ -20,4 +20,7 @@ if [ -f $SCRIPT_DIR/env.sh ]; then
   source $SCRIPT_DIR/env.sh
 fi
 
-uv run $SCRIPT_DIR/setup_tests.py "$@"
+. $ROOT/.evergreen/utils.sh
+UV=$(get_uv)
+
+$UV run $SCRIPT_DIR/setup_tests.py "$@"

.evergreen/utils.sh

@@ -138,3 +138,22 @@ get_python_binary() {
         return 1
     fi
 }
+
+
+# Get the appropriate uv binary.
+get_uv() {
+    # Try to use the binaries in the toolchain if available.
+    if [ -f "/cygdrive/c/Python/Current/Scripts/uv.exe" ]; then
+        echo "/cygdrive/c/Python/Current/Scripts/uv.exe"
+        return
+    fi
+    if [ -f "/Library/Frameworks/Python.Framework/Versions/Current/bin/uv" ]; then
+        echo "/Library/Frameworks/Python.Framework/Versions/Current/bin/uv"
+        return
+    fi
+    if [ -f "/opt/python/Current/bin" ]; then
+        echo "/opt/python/Current/bin/uv"
+        return
+    fi
+    echo "$(which uv)"
+}