Merge branch 'master' of github.com:mongodb/mongo-python-driver into PYTHON-3096-2

Author: blink1073

.evergreen/combine-coverage.sh

@@ -8,7 +8,6 @@ buildvariants:
       - rhel79-small
     batchtime: 10080
     expansions:
-      SKIP_HATCH: "true"
       PYTHON_BINARY: /opt/python/3.9/bin/python3
   - name: other-hosts-rhel9-fips
     tasks:
@@ -18,7 +17,7 @@ buildvariants:
       - rhel92-fips
     batchtime: 10080
     expansions:
-      SKIP_HATCH: "true"
+      NO_EXT: "1"
   - name: other-hosts-rhel8-zseries
     tasks:
       - name: .6.0 .standalone !.sync_async
@@ -27,7 +26,7 @@ buildvariants:
       - rhel8-zseries-small
     batchtime: 10080
     expansions:
-      SKIP_HATCH: "true"
+      NO_EXT: "1"
   - name: other-hosts-rhel8-power8
     tasks:
       - name: .6.0 .standalone !.sync_async
@@ -36,7 +35,7 @@ buildvariants:
       - rhel8-power-small
     batchtime: 10080
     expansions:
-      SKIP_HATCH: "true"
+      NO_EXT: "1"
   - name: other-hosts-rhel8-arm64
     tasks:
       - name: .6.0 .standalone !.sync_async
@@ -45,7 +44,7 @@ buildvariants:
       - rhel82-arm64-small
     batchtime: 10080
     expansions:
-      SKIP_HATCH: "true"
+      NO_EXT: "1"
 
   # Atlas connect tests
   - name: atlas-connect-rhel8-python3.9

.evergreen/config.yml

@@ -1,45 +1,5 @@
 #!/bin/bash
-set -o errexit  # Exit the script with error if any of the commands fail
-set -x
+set -eu
 
-. .evergreen/utils.sh
-
-if [ -z "$PYTHON_BINARY" ]; then
-    PYTHON_BINARY=$(find_python3)
-fi
-
-# Check if we should skip hatch and run the tests directly.
-if [ -n "$SKIP_HATCH" ]; then
-    ENV_NAME=testenv-$RANDOM
-    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
-    # shellcheck disable=SC2064
-    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
-    python -m pip install -e ".[test]"
-    run_hatch() {
-      bash ./.evergreen/run-tests.sh
-    }
-else # Set up virtualenv before installing hatch
-    # Use a random venv name because the encryption tasks run this script multiple times in the same run.
-    ENV_NAME=hatchenv-$RANDOM
-    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
-    # shellcheck disable=SC2064
-    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
-    python -m pip install -q hatch
-
-    # Ensure hatch does not write to user or global locations.
-    touch hatch_config.toml
-    HATCH_CONFIG=$(pwd)/hatch_config.toml
-    if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
-        HATCH_CONFIG=$(cygpath -m "$HATCH_CONFIG")
-    fi
-    export HATCH_CONFIG
-    hatch config restore
-    hatch config set dirs.data "$(pwd)/.hatch/data"
-    hatch config set dirs.cache "$(pwd)/.hatch/cache"
-
-    run_hatch() {
-      python -m hatch run "$@"
-    }
-fi
-
-run_hatch "${@:1}"
+. .evergreen/scripts/ensure-hatch.sh
+hatch run "$@"

.evergreen/generated_configs/variants.yml

@@ -8,6 +8,9 @@ cp ${PROJECT_DIRECTORY}/test/certificates/* ${DRIVERS_TOOLS}/.evergreen/x509gen/
 # Replace MongoOrchestration's client certificate.
 cp ${PROJECT_DIRECTORY}/test/certificates/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
 
+# Ensure hatch is installed.
+bash ${PROJECT_DIRECTORY}/scripts/ensure-hatch.sh
+
 if [ -w /etc/hosts ]; then
   SUDO=""
 else

.evergreen/hatch.sh

@@ -25,9 +25,9 @@ function get_import_time() {
 }
 
 get_import_time $HEAD_SHA
-git stash
+git stash || true
 git checkout $BASE_SHA
 get_import_time $BASE_SHA
 git checkout $HEAD_SHA
-git stash apply
+git stash apply || true
 python tools/compare_import_time.py $HEAD_SHA $BASE_SHA