Skip to content

Commit 0b0a50b

Browse files
committed
Merge remote-tracking branch 'origin/master' into INTPYTHON-5355-Numpy-Arrays-In-BinaryVectors
2 parents e3b894b + 0c8a22b commit 0b0a50b

25 files changed

+547
-717
lines changed

.evergreen/combine-coverage.sh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,12 @@
55

66
set -eu
77

8-
. .evergreen/utils.sh
8+
# Set up the virtual env.
9+
. .evergreen/scripts/setup-dev-env.sh
10+
uv sync --group coverage
11+
source .venv/bin/activate
912

10-
if [ -z "${PYTHON_BINARY:-}" ]; then
11-
PYTHON_BINARY=$(find_python3)
12-
fi
13-
14-
createvirtualenv "$PYTHON_BINARY" covenv
15-
# Keep in sync with run-tests.sh
16-
# coverage >=5 is needed for relative_files=true.
17-
pip install -q "coverage[toml]>=5,<=7.5"
18-
19-
pip list
2013
ls -la coverage/
2114

22-
python -m coverage combine coverage/coverage.*
23-
python -m coverage html -d htmlcov
15+
coverage combine coverage/coverage.*
16+
coverage html -d htmlcov

.evergreen/generated_configs/functions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ functions:
101101
- AUTH
102102
- SSL
103103
- ORCHESTRATION_FILE
104-
- PYTHON_BINARY
105-
- PYTHON_VERSION
104+
- UV_PYTHON
105+
- TOOLCHAIN_VERSION
106106
- STORAGE_ENGINE
107107
- REQUIRE_API_VERSION
108108
- DRIVERS_TOOLS
@@ -134,10 +134,10 @@ functions:
134134
- AWS_SECRET_ACCESS_KEY
135135
- AWS_SESSION_TOKEN
136136
- COVERAGE
137-
- PYTHON_BINARY
137+
- UV_PYTHON
138138
- LIBMONGOCRYPT_URL
139139
- MONGODB_URI
140-
- PYTHON_VERSION
140+
- TOOLCHAIN_VERSION
141141
- DISABLE_TEST_COMMANDS
142142
- GREEN_FRAMEWORK
143143
- NO_EXT

0 commit comments

Comments
 (0)