Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/config.yml

@@ -42,7 +42,7 @@ functions:
     # Make an evergreen expansion file with dynamic values
     - command: subprocess.exec
       params:
-        include_expansions_in_env: ["is_patch", "project", "version_id", "skip_web_identity_auth_test", "skip_ECS_auth_test"]
+        include_expansions_in_env: ["is_patch", "project", "version_id"]
         binary: bash
         working_dir: "src"
         args:
@@ -213,16 +213,14 @@ functions:
       params:
         file: ${DRIVERS_TOOLS}/mo-expansion.yml
 
-  "run doctests":
-     - command: subprocess.exec
-       type: test
-       params:
-         include_expansions_in_env: [ "PYTHON_BINARY" ]
-         working_dir: "src"
-         binary: bash
-         args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-doctests.sh
+  "run just script":
+    - command: subprocess.exec
+      type: test
+      params:
+       include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
+       binary: bash
+       working_dir: "src"
+       args: [.evergreen/just.sh, "${JUSTFILE_TARGET}"]
 
   "run tests":
     - command: subprocess.exec
@@ -248,7 +246,6 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/cleanup.sh
 
   "teardown system":
@@ -268,27 +265,7 @@ functions:
     - command: ec2.assume_role
       params:
         role_arn: ${aws_test_secrets_role}
-
-  "setup atlas":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        include_expansions_in_env: ["task_id", "execution"]
-        env:
-          MONGODB_VERSION: "7.0"
-          LAMBDA_STACK_NAME: dbx-python-lambda
-        args:
-          - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
-    - command: expansions.update
-      params:
-        file: atlas-expansion.yml
-
-  "teardown atlas":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        args:
-          - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
+        duration_seconds: 3600
 
   "attach benchmark test results":
     - command: attach.results
@@ -314,31 +291,6 @@ post:
   - func: "upload test results"
   - func: "cleanup"
 
-task_groups:
-  - name: test_aws_lambda_task_group
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - func: setup atlas
-    teardown_task:
-      - func: teardown atlas
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-      - test-aws-lambda-deployed
-
-  - name: test_atlas_task_group_search_indexes
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - func: setup atlas
-    teardown_task:
-      - func: teardown atlas
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-      - test-search-index-helpers
-
 tasks:
     # Wildcard task. Do you need to find out what tools are available and where?
     # Throw it here, and execute this task on all buildvariants
@@ -350,63 +302,7 @@ tasks:
           params:
             args:
               - src/.evergreen/scripts/run-getdata.sh
-# Standard test tasks {{{
-
-    - name: "mockupdb"
-      tags: ["mockupdb"]
-      commands:
-        - func: "run tests"
-          vars:
-            TEST_NAME: mockupdb
-
-    - name: "doctests"
-      tags: ["doctests"]
-      commands:
-        - func: "run server"
-        - func: "run doctests"
 
-    - name: "test-search-index-helpers"
-      commands:
-        - func: "run server"
-          vars:
-            VERSION: "6.0"
-            TOPOLOGY: "replica_set"
-        - func: "run tests"
-          vars:
-            TEST_NAME: index_management
-            AUTH: "auth"
-
-    - name: "no-server"
-      tags: ["no-server"]
-      commands:
-        - func: "run tests"
-
-    - name: "free-threading"
-      tags: ["free-threading"]
-      commands:
-        - func: "run server"
-          vars:
-            VERSION: "8.0"
-            TOPOLOGY: "replica_set"
-        - func: "run tests"
-
-    - name: "test-aws-lambda-deployed"
-      commands:
-        - command: ec2.assume_role
-          params:
-            role_arn: ${LAMBDA_AWS_ROLE_ARN}
-            duration_seconds: 3600
-        - command: subprocess.exec
-          params:
-            working_dir: src
-            binary: bash
-            add_expansions_to_env: true
-            args:
-              - .evergreen/run-deployed-lambda-aws-tests.sh
-            env:
-              TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
-
-# }}}
     - name: "coverage-report"
       tags: ["coverage"]
       depends_on:
@@ -456,12 +352,6 @@ tasks:
             - ${github_commit}
 
 buildvariants:
-- name: "no-server"
-  display_name: "No server"
-  run_on:
-    - rhel84-small
-  tasks:
-    - name: "no-server"
 
 - name: "Coverage Report"
   display_name: "Coverage Report"
@@ -482,12 +372,6 @@ buildvariants:
       batchtime: 10080  # 7 days
     - name: test-azurekms-fail
 
-- name: rhel8-test-lambda
-  display_name: FaaS Lambda
-  run_on: rhel87-small
-  tasks:
-    - name: test_aws_lambda_task_group
-
 - name: rhel8-import-time
   display_name: Import Time
   run_on: rhel87-small

.evergreen/generated_configs/tasks.yml

@@ -23,6 +23,15 @@ tasks:
           TEST_NAME: data_lake
     tags: [atlas_data_lake]
 
+  # Aws lambda tests
+  - name: test-aws-lambda-deployed
+    commands:
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: aws_lambda
+    tags: [aws_lambda]
+
   # Aws tests
   - name: test-auth-aws-4.4-regular
     commands:
@@ -704,6 +713,15 @@ tasks:
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, auth-aws-web-identity]
 
+  # Doctest tests
+  - name: test-doctests
+    commands:
+      - func: run server
+      - func: run just script
+        vars:
+          JUSTFILE_TARGET: docs-test
+    tags: [doctests]
+
   # Enterprise auth tests
   - name: test-enterprise-auth
     commands:
@@ -718,6 +736,16 @@ tasks:
           AUTH: auth
     tags: [enterprise_auth]
 
+  # Free threading tests
+  - name: test-free-threading
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: replica_set
+      - func: run tests
+    tags: [free-threading]
+
   # Kms tests
   - name: test-gcpkms
     commands:
@@ -790,6 +818,14 @@ tasks:
           TEST_NAME: load_balancer
     tags: [load-balancer, noauth, nossl]
 
+  # Mockupdb tests
+  - name: test-mockupdb
+    commands:
+      - func: run tests
+        vars:
+          TEST_NAME: mockupdb
+    tags: [mockupdb]
+
   # Mod wsgi tests
   - name: mod-wsgi-standalone
     commands:
@@ -832,6 +868,12 @@ tasks:
           SUB_TEST_NAME: embedded
     tags: [mod_wsgi]
 
+  # No server tests
+  - name: test-no-server
+    commands:
+      - func: run tests
+    tags: [no-server]
+
   # Ocsp tests
   - name: test-ocsp-ecdsa-valid-cert-server-does-not-staple
     commands:
@@ -1220,6 +1262,18 @@ tasks:
       - func: send dashboard data
     tags: [perf]
 
+  # Search index tests
+  - name: test-search-index-helpers
+    commands:
+      - func: assume ec2 role
+      - func: run server
+        vars:
+          TEST_NAME: search_index
+      - func: run tests
+        vars:
+          TEST_NAME: search_index
+    tags: [search_index]
+
   # Server tests
   - name: test-4.0-standalone-auth-ssl-sync
     commands:

.evergreen/generated_configs/variants.yml

@@ -132,6 +132,14 @@ buildvariants:
     expansions:
       PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 
+  # Aws lambda tests
+  - name: faas-lambda
+    tasks:
+      - name: .aws_lambda
+    display_name: FaaS Lambda
+    run_on:
+      - rhel87-small
+
   # Compression tests
   - name: compression-snappy-rhel8-python3.9-no-c
     tasks:
@@ -234,7 +242,7 @@ buildvariants:
   # Doctests tests
   - name: doctests-rhel8-python3.9
     tasks:
-      - name: doctests
+      - name: .doctests
     display_name: Doctests RHEL8 Python3.9
     run_on:
       - rhel87-small
@@ -664,7 +672,7 @@ buildvariants:
   # Mockupdb tests
   - name: mockupdb-rhel8-python3.9
     tasks:
-      - name: mockupdb
+      - name: .mockupdb
     display_name: MockupDB RHEL8 Python3.9
     run_on:
       - rhel87-small
@@ -738,6 +746,14 @@ buildvariants:
       NO_EXT: "1"
       PYTHON_BINARY: /opt/python/3.13/bin/python3
 
+  # No server tests
+  - name: no-server
+    tasks:
+      - name: .no-server
+    display_name: No server
+    run_on:
+      - rhel87-small
+
   # Ocsp tests
   - name: ocsp-rhel8-v4.4-python3.9
     tasks:
@@ -986,7 +1002,7 @@ buildvariants:
   # Search index tests
   - name: search-index-helpers-rhel8-python3.9
     tasks:
-      - name: test_atlas_task_group_search_indexes
+      - name: .search_index
     display_name: Search Index Helpers RHEL8 Python3.9
     run_on:
       - rhel87-small

.evergreen/run-deployed-lambda-aws-tests.sh

@@ -34,7 +34,10 @@ fi
 uv sync ${UV_ARGS} --reinstall
 uv pip list
 
+# Ensure we go back to base environment after the test.
+trap "uv sync" EXIT HUP
+
 # Start the test runner.
-uv run .evergreen/scripts/run_tests.py "$@"
+uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 
 popd

.evergreen/run-tests.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
 
+HERE=$(dirname ${BASH_SOURCE:-$0})
+
+# Try to source the env file.
+if [ -f $HERE/env.sh ]; then
+  echo "Sourcing env file"
+  source $HERE/env.sh
+fi
+
 rm -rf "${DRIVERS_TOOLS}" || true
 rm -f ./secrets-export.sh || true

.evergreen/scripts/cleanup.sh

@@ -60,8 +60,6 @@ export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 export MONGODB_BINARIES="$MONGODB_BINARIES"
 export DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
-export skip_web_identity_auth_test="${skip_web_identity_auth_test:-}"
-export skip_ECS_auth_test="${skip_ECS_auth_test:-}"
 
 export CARGO_HOME="$CARGO_HOME"
 export UV_TOOL_DIR="$UV_TOOL_DIR"