Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PYTHON-5268 Fix handling of PYTHON_BINARY #2264

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

PYTHON-5268 Fix handling of PYTHON_BINARY #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
98829c4
PYTHON-5268 Fix handling of PYTHON_BINARY
blink1073 Apr 4, 2025
2108259
cleanup
blink1073 Apr 4, 2025
16819b1
handle pass through var
blink1073 Apr 5, 2025
118ed8b
Merge branch 'master' of github.com:mongodb/mongo-python-driver into …
blink1073 Apr 5, 2025
45b39ea
fix pass through handling
blink1073 Apr 5, 2025
3e2bfc7
fix pass through handling
blink1073 Apr 5, 2025
b838b8b
cleanup output
blink1073 Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .evergreen/scripts/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function _pip_install() {


# Ensure just is installed.
if ! command -v just 2>/dev/null; then
if ! command -v just >/dev/null 2>&1; then
# On most systems we can install directly.
_TARGET=""
if [ "Windows_NT" = "${OS:-}" ]; then
Expand All @@ -54,7 +54,7 @@ if ! command -v just 2>/dev/null; then
fi

# Install uv.
if ! command -v uv 2>/dev/null; then
if ! command -v uv >/dev/null 2>&1; then
echo "Installing uv..."
# On most systems we can install directly.
curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
Expand Down
4 changes: 1 addition & 3 deletions .evergreen/scripts/setup-dev-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd $ROOT > /dev/null
if [ -f $HERE/env.sh ]; then
. $HERE/env.sh
fi
# PYTHON_BINARY may be defined in test-env.sh.
# PYTHON_BINARY or PYTHON_VERSION may be defined in test-env.sh.
if [ -f $HERE/test-env.sh ]; then
. $HERE/test-env.sh
fi
Expand All @@ -21,7 +21,6 @@ bash $HERE/install-dependencies.sh

# Get the appropriate UV_PYTHON.
. $ROOT/.evergreen/utils.sh
set -x

if [ -z "${PYTHON_BINARY:-}" ]; then
if [ -n "${PYTHON_VERSION:-}" ]; then
Expand All @@ -31,7 +30,6 @@ if [ -z "${PYTHON_BINARY:-}" ]; then
fi
fi
export UV_PYTHON=${PYTHON_BINARY}
echo "export UV_PYTHON=$UV_PYTHON" >> $HERE/env.sh
echo "Using python $UV_PYTHON"

# Add the default install path to the path if needed.
Expand Down
13 changes: 10 additions & 3 deletions .evergreen/scripts/setup_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@
)

# Passthrough environment variables.
PASS_THROUGH_ENV = ["GREEN_FRAMEWORK", "NO_EXT", "MONGODB_API_VERSION", "DEBUG_LOG"]
PASS_THROUGH_ENV = [
"GREEN_FRAMEWORK",
"NO_EXT",
"MONGODB_API_VERSION",
"DEBUG_LOG",
"PYTHON_BINARY",
"PYTHON_VERSION",
]

# Map the test name to test extra.
EXTRAS_MAP = {
Expand Down Expand Up @@ -164,8 +171,8 @@ def handle_test_env() -> None:

# Handle pass through env vars.
for var in PASS_THROUGH_ENV:
if is_set(var) or getattr(opts, var.lower()):
write_env(var, os.environ.get(var, getattr(opts, var.lower())))
if is_set(var) or getattr(opts, var.lower(), ""):
write_env(var, os.environ.get(var, getattr(opts, var.lower(), "")))

if extra := EXTRAS_MAP.get(test_name, ""):
UV_ARGS.append(f"--extra {extra}")
Expand Down
Loading