cleanup

Author: blink1073

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

@@ -6,11 +6,6 @@ HERE=$(dirname ${BASH_SOURCE:-$0})
 HERE="$( cd -- "$HERE" > /dev/null 2>&1 && pwd )"
 ROOT=$(dirname "$(dirname $HERE)")
 
-# Set up the uv environment if indicated.
-if [ "${1:-}" == "ensure-uv" ]; then
-  bash $HERE/setup-uv-python.sh
-fi
-
 # Source the env files to pick up common variables.
 if [ -f $HERE/env.sh ]; then
   . $HERE/env.sh
@@ -24,6 +19,9 @@ fi
 # Ensure dependencies are installed.
 bash $HERE/install-dependencies.sh
 
+# Handle the value for UV_PYTHON.
+. $HERE/setup-uv-python.sh
+
 # Only run the next part if not running on CI.
 if [ -z "${CI:-}" ]; then
   # Add the default install path to the path if needed.

.evergreen/scripts/setup-uv-python.sh

@@ -18,8 +18,6 @@ if [ -f $HERE/test-env.sh ]; then
   . $HERE/test-env.sh
 fi
 
-set -x
-
 # Translate PYTHON_BINARY/PYTHON_VERSION to UV_PYTHON.
 if [ -z "${UV_PYTHON:-}" ]; then
   if [ -n "${PYTHON_BINARY:-}" ]; then
@@ -48,5 +46,5 @@ if [ -z "${UV_PYTHON:-}" ]; then
         _python="/opt/python/$_python/bin/python3"
     fi
   fi
-  echo "export UV_PYTHON=$_python" >> $HERE/env.sh
+  export UV_PYTHON="$_version"
 fi