Skip to content

Commit 3e29671

Browse files
authored
PYTHON-5134 Fix binary installation and remove unused scripts (#2146)
1 parent 338b7dc commit 3e29671

10 files changed

+29
-50
lines changed

.evergreen/scripts/archive-mongodb-logs.sh

-8
This file was deleted.

.evergreen/scripts/configure-env.sh

+17-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ CARGO_HOME=${CARGO_HOME:-${DRIVERS_TOOLS}/.cargo}
1717
UV_TOOL_DIR=$PROJECT_DIRECTORY/.local/uv/tools
1818
UV_CACHE_DIR=$PROJECT_DIRECTORY/.local/uv/cache
1919
DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS/.bin"
20+
MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
2021

2122
# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
2223
if [ "${CI:-}" == "true" ]; then
@@ -26,6 +27,8 @@ else
2627
PYMONGO_BIN_DIR=$HOME/cli_bin
2728
fi
2829

30+
PATH_EXT="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:\$PATH"
31+
2932
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
3033
if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
3134
DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
@@ -34,6 +37,7 @@ if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
3437
UV_TOOL_DIR=$(cygpath -m "$UV_TOOL_DIR")
3538
UV_CACHE_DIR=$(cygpath -m "$UV_CACHE_DIR")
3639
DRIVERS_TOOLS_BINARIES=$(cygpath -m "$DRIVERS_TOOLS_BINARIES")
40+
MONGODB_BINARIES=$(cygpath -m "$MONGODB_BINARIES")
3741
PYMONGO_BIN_DIR=$(cygpath -m "$PYMONGO_BIN_DIR")
3842
fi
3943

@@ -73,17 +77,28 @@ export skip_web_identity_auth_test="${skip_web_identity_auth_test:-}"
7377
export skip_ECS_auth_test="${skip_ECS_auth_test:-}"
7478
7579
export CARGO_HOME="$CARGO_HOME"
76-
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
7780
export UV_TOOL_DIR="$UV_TOOL_DIR"
7881
export UV_CACHE_DIR="$UV_CACHE_DIR"
7982
export UV_TOOL_BIN_DIR="$DRIVERS_TOOLS_BINARIES"
8083
export PYMONGO_BIN_DIR="$PYMONGO_BIN_DIR"
81-
export PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:$PATH"
84+
export PATH="$PATH_EXT"
8285
# shellcheck disable=SC2154
8386
export PROJECT="${project:-mongo-python-driver}"
8487
export PIP_QUIET=1
8588
EOT
8689

90+
# Write the .env file for drivers-tools.
91+
rm -rf $DRIVERS_TOOLS
92+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
93+
94+
cat <<EOT > ${DRIVERS_TOOLS}/.env
95+
SKIP_LEGACY_SHELL=1
96+
DRIVERS_TOOLS="$DRIVERS_TOOLS"
97+
MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
98+
MONGODB_BINARIES="$MONGODB_BINARIES"
99+
TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
100+
EOT
101+
87102
# Skip CSOT tests on non-linux platforms.
88103
if [ "$(uname -s)" != "Linux" ]; then
89104
echo "export SKIP_CSOT_TESTS=1" >> $SCRIPT_DIR/env.sh

.evergreen/scripts/fix-absolute-paths.sh

-8
This file was deleted.

.evergreen/scripts/init-test-results.sh

-5
This file was deleted.

.evergreen/scripts/install-dependencies.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@ function _pip_install() {
1818
_HERE=$(dirname ${BASH_SOURCE:-$0})
1919
. $_HERE/../utils.sh
2020
_VENV_PATH=$(mktemp -d)
21+
if [ "Windows_NT" = "${OS:-}" ]; then
22+
_VENV_PATH=$(cygpath -m $_VENV_PATH)
23+
fi
2124
echo "Installing $2 using pip..."
2225
createvirtualenv "$(find_python3)" $_VENV_PATH
2326
python -m pip install $1
24-
ln -s "$(which $2)" $_BIN_DIR/$2
27+
if [ "Windows_NT" = "${OS:-}" ]; then
28+
ln -s "$(which $2)" $_BIN_DIR/$2.exe
29+
else
30+
ln -s "$(which $2)" $_BIN_DIR/$2
31+
fi
2532
echo "Installed to ${_BIN_DIR}"
2633
echo "Installing $2 using pip... done."
2734
}
@@ -49,6 +56,9 @@ if ! command -v uv 2>/dev/null; then
4956
curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
5057
_pip_install uv uv
5158
}
59+
if [ "Windows_NT" = "${OS:-}" ]; then
60+
chmod +x "$(cygpath -u $_BIN_DIR)/uv.exe"
61+
fi
5262
echo "Installing uv... done."
5363
fi
5464

.evergreen/scripts/make-files-executable.sh

-8
This file was deleted.

.evergreen/scripts/prepare-resources.sh

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ HERE=$(dirname ${BASH_SOURCE:-$0})
55
pushd $HERE
66
. env.sh
77

8-
rm -rf $DRIVERS_TOOLS
9-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
10-
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" >$MONGO_ORCHESTRATION_HOME/orchestration.config
11-
128
popd
139

1410
# Copy PyMongo's test certificates over driver-evergreen-tools'

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
set -eu
3+
set -eux
44

55
HERE=$(dirname ${BASH_SOURCE:-$0})
66
pushd "$(dirname "$(dirname $HERE)")" > /dev/null

.evergreen/scripts/windows-fix.sh

-11
This file was deleted.

justfile

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# See https://just.systems/man/en/ for instructions
22
set shell := ["bash", "-c"]
3-
set dotenv-load
4-
set dotenv-filename := "./.evergreen/scripts/env.sh"
53

64
# Commonly used command segments.
75
uv_run := "uv run --isolated --frozen "

0 commit comments

Comments
 (0)