Merge branch 'PYTHON-3636' of github.com:sleepyStick/mongo-python-driver into PYTHON-3636

Author: sleepyStick

.evergreen/config.yml

@@ -267,28 +267,6 @@ functions:
         binary: bash
         args: [.evergreen/just.sh, run-tests]
 
-  "run enterprise auth tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        working_dir: "src"
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-enterprise-auth-tests.sh
-
-  "run atlas tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        working_dir: "src"
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-atlas-tests.sh
-
   "cleanup":
     - command: subprocess.exec
       params:
@@ -372,29 +350,6 @@ post:
   - func: "cleanup"
 
 task_groups:
-  - name: serverless_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: "fetch source"
-      - func: "setup system"
-      - command: subprocess.exec
-        params:
-          binary: bash
-          env:
-            VAULT_NAME: ${VAULT_NAME}
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
-    teardown_task:
-      - command: subprocess.exec
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-      - func: "upload test results"
-    tasks:
-      - ".serverless"
-
   - name: test_aws_lambda_task_group
     setup_group:
       - func: fetch source
@@ -445,20 +400,6 @@ tasks:
         - func: "run server"
         - func: "run doctests"
 
-    - name: "test-serverless"
-      tags: ["serverless"]
-      commands:
-        - func: "run tests"
-          vars:
-            TEST_NAME: serverless
-
-    - name: "test-enterprise-auth"
-      tags: ["enterprise-auth"]
-      commands:
-        - func: "run server"
-        - func: "assume ec2 role"
-        - func: "run enterprise auth tests"
-
     - name: "test-search-index-helpers"
       commands:
         - func: "run server"
@@ -518,12 +459,6 @@ tasks:
             TOPOLOGY: "replica_set"
         - func: "run tests"
 
-    - name: "atlas-connect"
-      tags: ["atlas-connect"]
-      commands:
-        - func: "assume ec2 role"
-        - func: "run atlas tests"
-
     - name: atlas-data-lake-tests
       commands:
         - func: "bootstrap data lake"

.evergreen/generated_configs/tasks.yml

@@ -1,4 +1,13 @@
 tasks:
+  # Atlas connect tests
+  - name: test-atlas-connect
+    commands:
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: atlas_connect
+    tags: [atlas_connect]
+
   # Aws tests
   - name: test-auth-aws-4.4-regular
     commands:
@@ -680,6 +689,20 @@ tasks:
           AWS_ROLE_SESSION_NAME: test
     tags: [auth-aws, auth-aws-web-identity]
 
+  # Enterprise auth tests
+  - name: test-enterprise-auth
+    commands:
+      - func: run server
+        vars:
+          TEST_NAME: enterprise_auth
+          AUTH: auth
+      - func: assume ec2 role
+      - func: run tests
+        vars:
+          TEST_NAME: enterprise_auth
+          AUTH: auth
+    tags: [enterprise_auth]
+
   # Kms tests
   - name: test-gcpkms
     commands:
@@ -5866,3 +5889,13 @@ tasks:
       - noauth
       - nossl
       - sync_async
+
+  # Serverless tests
+  - name: test-serverless
+    commands:
+      - func: run tests
+        vars:
+          TEST_NAME: serverless
+          AUTH: auth
+          SSL: ssl
+    tags: [serverless]

.evergreen/generated_configs/variants.yml

@@ -49,15 +49,15 @@ buildvariants:
   # Atlas connect tests
   - name: atlas-connect-rhel8-python3.9
     tasks:
-      - name: atlas-connect
+      - name: .atlas_connect
     display_name: Atlas connect RHEL8 Python3.9
     run_on:
       - rhel87-small
     expansions:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
   - name: atlas-connect-rhel8-python3.13
     tasks:
-      - name: atlas-connect
+      - name: .atlas_connect
     display_name: Atlas connect RHEL8 Python3.13
     run_on:
       - rhel87-small
@@ -510,59 +510,53 @@ buildvariants:
     tags: [encryption_tag]
 
   # Enterprise auth tests
-  - name: auth-enterprise-macos-python3.9-auth
+  - name: auth-enterprise-macos-python3.9
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise macOS Python3.9 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise macOS Python3.9
     run_on:
       - macos-14
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: auth-enterprise-rhel8-python3.10-auth
+  - name: auth-enterprise-rhel8-python3.10
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.10 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.10
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.10/bin/python3
-  - name: auth-enterprise-rhel8-python3.11-auth
+  - name: auth-enterprise-rhel8-python3.11
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.11 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.11
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.11/bin/python3
-  - name: auth-enterprise-rhel8-python3.12-auth
+  - name: auth-enterprise-rhel8-python3.12
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 Python3.12 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 Python3.12
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/3.12/bin/python3
-  - name: auth-enterprise-win64-python3.13-auth
+  - name: auth-enterprise-win64-python3.13
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise Win64 Python3.13 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise Win64 Python3.13
     run_on:
       - windows-64-vsMulti-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: C:/python/Python313/python.exe
-  - name: auth-enterprise-rhel8-pypy3.10-auth
+  - name: auth-enterprise-rhel8-pypy3.10
     tasks:
-      - name: test-enterprise-auth
-    display_name: Auth Enterprise RHEL8 PyPy3.10 Auth
+      - name: .enterprise_auth
+    display_name: Auth Enterprise RHEL8 PyPy3.10
     run_on:
       - rhel87-small
     expansions:
-      AUTH: auth
       PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
 
   # Free threaded tests
@@ -1235,27 +1229,21 @@ buildvariants:
   # Serverless tests
   - name: serverless-rhel8-python3.9
     tasks:
-      - name: serverless_task_group
+      - name: .serverless
     display_name: Serverless RHEL8 Python3.9
     run_on:
       - rhel87-small
     batchtime: 10080
     expansions:
-      TEST_NAME: serverless
-      AUTH: auth
-      SSL: ssl
       PYTHON_BINARY: /opt/python/3.9/bin/python3
   - name: serverless-rhel8-python3.13
     tasks:
-      - name: serverless_task_group
+      - name: .serverless
     display_name: Serverless RHEL8 Python3.13
     run_on:
       - rhel87-small
     batchtime: 10080
     expansions:
-      TEST_NAME: serverless
-      AUTH: auth
-      SSL: ssl
       PYTHON_BINARY: /opt/python/3.13/bin/python3
 
   # Stable api tests

.evergreen/scripts/configure-env.sh

@@ -92,3 +92,24 @@ cat <<EOT > expansion.yml
 DRIVERS_TOOLS: "$DRIVERS_TOOLS"
 PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
 EOT
+
+# If the toolchain is available, symlink binaries to the bin dir.  This has to be done
+# after drivers-tools is cloned, since we might be using its binary dir.
+_bin_path=""
+if [ "Windows_NT" == "${OS:-}" ]; then
+  _bin_path="/cygdrive/c/Python/Current/Scripts"
+elif [ "$(uname -s)" != "Darwin" ]; then
+  _bin_path="/Library/Frameworks/Python.Framework/Versions/Current/bin"
+else
+  _bin_path="/opt/python/Current/bin"
+fi
+if [ -d "${_bin_path}" ]; then
+  _suffix=""
+  if [ "Windows_NT" == "${OS:-}" ]; then
+    _suffix=".exe"
+  fi
+  mkdir -p $PYMONGO_BIN_DIR
+  ln -s ${_bin_path}/just${_suffix} $PYMONGO_BIN_DIR/just${_suffix}
+  ln -s ${_bin_path}/uv${_suffix} $PYMONGO_BIN_DIR/uv${_suffix}
+  ln -s ${_bin_path}/uvx${_suffix} $PYMONGO_BIN_DIR/uvx${_suffix}
+fi

.evergreen/scripts/generate_config.py

@@ -464,7 +464,6 @@ def create_compression_variants():
 
 
 def create_enterprise_auth_variants():
-    expansions = dict(AUTH="auth")
     variants = []
 
     # All python versions across platforms.
@@ -475,10 +474,8 @@ def create_enterprise_auth_variants():
             host = HOSTS["win64"]
         else:
             host = DEFAULT_HOST
-        display_name = get_display_name("Auth Enterprise", host, python=python, **expansions)
-        variant = create_variant(
-            ["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
-        )
+        display_name = get_display_name("Auth Enterprise", host, python=python)
+        variant = create_variant([".enterprise_auth"], display_name, host=host, python=python)
         variants.append(variant)
 
     return variants
@@ -645,16 +642,14 @@ def create_disable_test_commands_variants():
 def create_serverless_variants():
     host = DEFAULT_HOST
     batchtime = BATCHTIME_WEEK
-    expansions = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
-    tasks = ["serverless_task_group"]
+    tasks = [".serverless"]
     base_name = "Serverless"
     return [
         create_variant(
             tasks,
             get_display_name(base_name, host, python=python),
             host=host,
             python=python,
-            expansions=expansions,
             batchtime=batchtime,
         )
         for python in MIN_MAX_PYTHON
@@ -723,7 +718,7 @@ def create_atlas_connect_variants():
     host = DEFAULT_HOST
     return [
         create_variant(
-            ["atlas-connect"],
+            [".atlas_connect"],
             get_display_name("Atlas connect", host, python=python),
             python=python,
             host=host,
@@ -915,6 +910,25 @@ def _create_ocsp_task(algo, variant, server_type, base_task_name):
     return EvgTask(name=task_name, tags=tags, commands=commands)
 
 
+def create_atlas_connect_tasks():
+    vars = dict(TEST_NAME="atlas_connect")
+    assume_func = FunctionCall(func="assume ec2 role")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-atlas-connect"
+    tags = ["atlas_connect"]
+    return [EvgTask(name=task_name, tags=tags, commands=[assume_func, test_func])]
+
+
+def create_enterprise_auth_tasks():
+    vars = dict(TEST_NAME="enterprise_auth", AUTH="auth")
+    server_func = FunctionCall(func="run server", vars=vars)
+    assume_func = FunctionCall(func="assume ec2 role")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-enterprise-auth"
+    tags = ["enterprise_auth"]
+    return [EvgTask(name=task_name, tags=tags, commands=[server_func, assume_func, test_func])]
+
+
 def create_ocsp_tasks():
     tasks = []
     tests = [
@@ -951,6 +965,14 @@ def create_ocsp_tasks():
     return tasks
 
 
+def create_serverless_tasks():
+    vars = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    tags = ["serverless"]
+    task_name = "test-serverless"
+    return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
+
+
 ##################
 # Generate Config
 ##################

.evergreen/scripts/install-dependencies.sh

@@ -24,10 +24,14 @@ function _pip_install() {
   echo "Installing $2 using pip..."
   createvirtualenv "$(find_python3)" $_VENV_PATH
   python -m pip install $1
+  _suffix=""
   if [ "Windows_NT" = "${OS:-}" ]; then
-    ln -s "$(which $2)" $_BIN_DIR/$2.exe
-  else
-    ln -s "$(which $2)" $_BIN_DIR/$2
+    _suffix=".exe"
+  fi
+  ln -s "$(which $2)" $_BIN_DIR/${2}${_suffix}
+  # uv also comes with a uvx binary.
+  if [ $2 == "uv" ]; then
+    ln -s "$(which uvx)" $_BIN_DIR/uvx${_suffix}
   fi
   echo "Installed to ${_BIN_DIR}"
   echo "Installing $2 using pip... done."