Skip to content

Commit 8b6f224

Browse files
committed
clean up install
1 parent 8a621f2 commit 8b6f224

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.evergreen/install-dependencies.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,43 @@ function _pip_install() {
1818
_HERE=$(dirname ${BASH_SOURCE:-$0})
1919
. $_HERE/utils.sh
2020
_VENV_PATH=$(mktemp -d)
21+
echo "Installing $2 using pip..."
2122
createvirtualenv $(find_python3) $_VENV_PATH
2223
python -m pip install $1
2324
ln -s $(which $2) $_BIN_DIR/$2
25+
echo "Installing $2 using pip... done."
2426
}
2527

26-
_CURL_ARGS="--tlsv1.2 -LsSf"
28+
function _curl() {
29+
curl --tlsv1.2 -LsSf $1
30+
}
2731

2832
# Install just.
2933
if ! command -v just 2>/dev/null; then
34+
_TARGET=""
3035
if [ "Windows_NT" = "${OS:-}" ]; then
3136
_TARGET="--target x86_64-pc-windows-msvc"
32-
else
33-
_TARGET=""
3437
fi
3538
# On most systems we can install directly.
36-
curl $_CURL_ARGS https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
39+
echo "Installing just..."
40+
_curl https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
3741
_pip_install rust-just just
3842
}
3943
if ! command -v just 2>/dev/null; then
4044
export PATH="$PATH:$_BIN_DIR"
4145
fi
46+
echo "Installing just... done."
4247
fi
4348

4449
# Install uv.
4550
if ! command -v uv 2>/dev/null; then
51+
echo "Installing uv..."
4652
# On most systems we can install directly.
47-
curl $_CURL_ARGS https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
53+
_curl https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
4854
_pip_install uv uv
4955
}
5056
if ! command -v uv 2>/dev/null; then
5157
export PATH="$PATH:$_BIN_DIR"
5258
fi
59+
echo "Installing uv... done."
5360
fi

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ fi
1212

1313
# Ensure dependencies are installed.
1414
. .evergreen/install-dependencies.sh
15-
echo "HELLO: $PATH"
1615

1716
# Ensure that we have the correct base python binary.
17+
echo "Setting up python environment..."
1818
if [ -z "${UV_PYTHON:-}" ]; then
1919
. .evergreen/utils.sh
2020

@@ -24,10 +24,10 @@ if [ -z "${UV_PYTHON:-}" ]; then
2424
export UV_PYTHON=${PYTHON_BINARY}
2525
echo "export UV_PYTHON=$UV_PYTHON" >> $HERE/env.sh
2626
fi
27-
28-
# Set up the python environment.
27+
echo "Using python $UV_PYTHON"
2928
uv sync
3029
uv run --with pip pip install -e .
30+
echo "Setting up python environment... done."
3131

3232
# Ensure there is a pre-commit hook if there is a git checkout.
3333
if [ -d .git ] && [ ! -f .git/hooks/pre-commit ]; then

0 commit comments

Comments
 (0)