Skip to content

Commit 025a0ff

Browse files
committed
debug
1 parent d28ea9c commit 025a0ff

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

.evergreen/generated_configs/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ functions:
134134
- AWS_SECRET_ACCESS_KEY
135135
- AWS_SESSION_TOKEN
136136
- COVERAGE
137-
- PYTHON_VERSION
138137
- PYTHON_BINARY
139138
- LIBMONGOCRYPT_URL
140139
- MONGODB_URI
140+
- PYTHON_VERSION
141141
- DISABLE_TEST_COMMANDS
142142
- GREEN_FRAMEWORK
143143
- NO_EXT

.evergreen/just.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ set -eu
33

44
. .evergreen/scripts/setup-dev-env.sh ensure-uv
55

6-
env
76
just "$@"

.evergreen/scripts/generate_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,10 +1099,10 @@ def create_run_tests_func():
10991099
"AWS_SECRET_ACCESS_KEY",
11001100
"AWS_SESSION_TOKEN",
11011101
"COVERAGE",
1102-
"PYTHON_VERSION",
11031102
"PYTHON_BINARY",
11041103
"LIBMONGOCRYPT_URL",
11051104
"MONGODB_URI",
1105+
"PYTHON_VERSION",
11061106
"DISABLE_TEST_COMMANDS",
11071107
"GREEN_FRAMEWORK",
11081108
"NO_EXT",

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@ if [ -f $HERE/test-env.sh ]; then
1818
. $HERE/test-env.sh
1919
fi
2020

21+
set -x
22+
2123
# Translate PYTHON_BINARY/PYTHON_VERSION to UV_PYTHON.
2224
if [ -z "${UV_PYTHON:-}" ]; then
2325
if [ -n "${PYTHON_BINARY:-}" ]; then
2426
_python=$PYTHON_BINARY
2527

2628
elif [ -n "${PYTHON_VERSION:-}" ]; then
27-
version=$PYTHON_VERSION
29+
_python=$PYTHON_VERSION
2830
if [ "$(uname -s)" = "Darwin" ]; then
29-
if [[ "$version" == *"t"* ]]; then
31+
if [[ "$_python" == *"t"* ]]; then
3032
binary_name="python3t"
3133
framework_dir="PythonT"
3234
else
3335
binary_name="python3"
3436
framework_dir="Python"
3537
fi
36-
version=$(echo "$version" | sed 's/t//g')
37-
_python="/Library/Frameworks/$framework_dir.Framework/Versions/$version/bin/$binary_name"
38+
_python=$(echo "$_python" | sed 's/t//g')
39+
_python="/Library/Frameworks/$framework_dir.Framework/Versions/$_python/bin/$binary_name"
3840
elif [ "Windows_NT" = "${OS:-}" ]; then
39-
version=$(echo $version | cut -d. -f1,2 | sed 's/\.//g; s/t//g')
41+
_python=$(echo $_python | cut -d. -f1,2 | sed 's/\.//g; s/t//g')
4042
if [ -n "${IS_WIN32:-}" ]; then
41-
_python="C:/python/32/Python$version/python.exe"
43+
_python="C:/python/32/Python$_python/python.exe"
4244
else
43-
_python="C:/python/Python$version/python.exe"
45+
_python="C:/python/Python$_python/python.exe"
4446
fi
45-
elif [ -d "/opt/python/$version/bin" ]; then
46-
_python="/opt/python/$version/bin/python3"
47-
else
48-
_python="${PYTHON_VERSION}"
47+
elif [ -d "/opt/python/$_python/bin" ]; then
48+
_python="/opt/python/$_python/bin/python3"
4949
fi
5050
fi
5151
echo "export UV_PYTHON=$_python" >> $HERE/env.sh

0 commit comments

Comments
 (0)