cleanup

Author: blink1073

.evergreen/just.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -eu
 
-. .evergreen/scripts/setup-dev-env.sh ensure-uv
+. .evergreen/scripts/setup-dev-env.sh
 
 just "$@"

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

@@ -38,6 +38,13 @@ if [ -z "${CI:-}" ]; then
     cd $ROOT && uv sync
   )
 
+  # Set up build utilities on Windows spawn hosts.
+  if [ -f $HOME/.visualStudioEnv.sh ]; then
+    set +u
+    SSH_TTY=1 source $HOME/.visualStudioEnv.sh
+    set -u
+  fi
+
   # Only set up pre-commit if we are in a git checkout.
   if [ -f $HERE/.git ]; then
     if ! command -v pre-commit &>/dev/null; then

.evergreen/scripts/setup-system.sh

@@ -12,13 +12,7 @@ popd
 
 # Run spawn host-specific tasks.
 if [ -z "${CI:-}" ]; then
-  # Set up build utilities on Windows.
-  if [ -f $HOME/.visualStudioEnv.sh ]; then
-    set +u
-    SSH_TTY=1 source $HOME/.visualStudioEnv.sh
-    set -u
-  fi
-  bash $HERE/setup-dev-env.sh ensure-uv
+  bash $HERE/setup-dev-env.sh
 fi
 
 # Enable core dumps if enabled on the machine

.evergreen/setup-spawn-host.sh

@@ -15,4 +15,4 @@ echo "Copying files to $target..."
 rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir
 echo "Copying files to $target... done"
 
-ssh $target "PYTHON_VERSION=${PYTHON_VERSION:-} $remote_dir/.evergreen/scripts/setup-system.sh"
+ssh $target "$remote_dir/.evergreen/scripts/setup-system.sh"