Skip to content

Commit 2b4ab2a

Browse files
authored
PYTHON-5365 Fix handing of remote tests (#2327)
1 parent 000391c commit 2b4ab2a

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.evergreen/scripts/install-dependencies.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ if [ -f $HERE/env.sh ]; then
1010
. $HERE/env.sh
1111
fi
1212

13+
# Set up the default bin directory.
14+
if [ -z "${PYMONGO_BIN_DIR:-}" ]; then
15+
PYMONGO_BIN_DIR="$HOME/.local/bin"
16+
export PATH="$PYMONGO_BIN_DIR:$PATH"
17+
fi
18+
1319
# Helper function to pip install a dependency using a temporary python env.
1420
function _pip_install() {
1521
_HERE=$(dirname ${BASH_SOURCE:-$0})
@@ -41,10 +47,6 @@ if ! command -v just &>/dev/null; then
4147
if [ "Windows_NT" = "${OS:-}" ]; then
4248
_TARGET="--target x86_64-pc-windows-msvc"
4349
fi
44-
if [ -z "${PYMONGO_BIN_DIR:-}" ]; then
45-
echo "Please install just!"
46-
exit 1
47-
fi
4850
_BIN_DIR=$PYMONGO_BIN_DIR
4951
echo "Installing just..."
5052
mkdir -p "$_BIN_DIR" 2>/dev/null || true
@@ -56,10 +58,6 @@ fi
5658

5759
# Ensure uv is installed.
5860
if ! command -v uv &>/dev/null; then
59-
if [ -z "${PYMONGO_BIN_DIR:-}" ]; then
60-
echo "Please install uv!"
61-
exit 1
62-
fi
6361
_BIN_DIR=$PYMONGO_BIN_DIR
6462
echo "Installing uv..."
6563
# On most systems we can install directly.

.evergreen/scripts/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,6 @@ def run_command(cmd: str | list[str], **kwargs: Any) -> None:
193193

194194
def create_archive() -> str:
195195
run_command("git add .", cwd=ROOT)
196-
run_command('git commit -m "add files"', check=False, cwd=ROOT)
196+
run_command('git commit --no-verify -m "add files"', check=False, cwd=ROOT)
197197
run_command(f"git archive -o {TMP_DRIVER_FILE} HEAD", cwd=ROOT)
198198
return TMP_DRIVER_FILE

0 commit comments

Comments
 (0)