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

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -804,112 +804,6 @@ buildvariants:
     expansions:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
-  # Server tests
-  - name: test-macos-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test macOS Python3.9"
-    run_on:
-      - macos-14
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: test-macos-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test macOS Python3.13"
-    run_on:
-      - macos-14
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-  - name: test-macos-arm64-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl .6.0 !.sync_async
-      - name: .replica_set .noauth .ssl .6.0 !.sync_async
-      - name: .standalone .noauth .nossl .6.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .7.0 !.sync_async
-      - name: .replica_set .noauth .ssl .7.0 !.sync_async
-      - name: .standalone .noauth .nossl .7.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .8.0 !.sync_async
-      - name: .replica_set .noauth .ssl .8.0 !.sync_async
-      - name: .standalone .noauth .nossl .8.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .rapid !.sync_async
-      - name: .replica_set .noauth .ssl .rapid !.sync_async
-      - name: .standalone .noauth .nossl .rapid !.sync_async
-      - name: .sharded_cluster .auth .ssl .latest !.sync_async
-      - name: .replica_set .noauth .ssl .latest !.sync_async
-      - name: .standalone .noauth .nossl .latest !.sync_async
-    display_name: "* Test macOS Arm64 Python3.9"
-    run_on:
-      - macos-14-arm64
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: test-macos-arm64-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl .6.0 !.sync_async
-      - name: .replica_set .noauth .ssl .6.0 !.sync_async
-      - name: .standalone .noauth .nossl .6.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .7.0 !.sync_async
-      - name: .replica_set .noauth .ssl .7.0 !.sync_async
-      - name: .standalone .noauth .nossl .7.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .8.0 !.sync_async
-      - name: .replica_set .noauth .ssl .8.0 !.sync_async
-      - name: .standalone .noauth .nossl .8.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .rapid !.sync_async
-      - name: .replica_set .noauth .ssl .rapid !.sync_async
-      - name: .standalone .noauth .nossl .rapid !.sync_async
-      - name: .sharded_cluster .auth .ssl .latest !.sync_async
-      - name: .replica_set .noauth .ssl .latest !.sync_async
-      - name: .standalone .noauth .nossl .latest !.sync_async
-    display_name: "* Test macOS Arm64 Python3.13"
-    run_on:
-      - macos-14-arm64
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-  - name: test-win64-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win64 Python3.9"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/Python39/python.exe
-  - name: test-win64-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win64 Python3.13"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/Python313/python.exe
-  - name: test-win32-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win32 Python3.9"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/32/Python39/python.exe
-  - name: test-win32-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win32 Python3.13"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/32/Python313/python.exe
-
   # Server version tests
   - name: mongodb-v4.0
     tasks:
@@ -1063,6 +957,42 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.13/bin/python3
     tags: [versionedApi_tag]
 
+  # Standard nonlinux tests
+  - name: test-macos
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test macOS"
+    run_on:
+      - macos-14
+    tags: [standard-non-linux]
+  - name: test-macos-arm64
+    tasks:
+      - name: .standard-non-linux .server-6.0
+      - name: .standard-non-linux .server-7.0
+      - name: .standard-non-linux .server-8.0
+      - name: .standard-non-linux .server-rapid
+      - name: .standard-non-linux .server-latest
+    display_name: "* Test macOS Arm64"
+    run_on:
+      - macos-14-arm64
+    tags: [standard-non-linux]
+  - name: test-win64
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test Win64"
+    run_on:
+      - windows-64-vsMulti-small
+    tags: [standard-non-linux]
+  - name: test-win32
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test Win32"
+    run_on:
+      - windows-64-vsMulti-small
+    expansions:
+      IS_WIN32: "1"
+    tags: [standard-non-linux]
+
   # Storage engine tests
   - name: storage-inmemory-rhel8-python3.9
     tasks:

.evergreen/generated_configs/variants.yml

@@ -83,23 +83,26 @@ def create_server_version_variants() -> list[BuildVariant]:
     return variants
 
 
-def create_server_variants() -> list[BuildVariant]:
+def create_standard_nonlinux_variants() -> list[BuildVariant]:
     variants = []
     base_display_name = "* Test"
 
     # Test a subset on each of the other platforms.
     for host_name in ("macos", "macos-arm64", "win64", "win32"):
-        for python in MIN_MAX_PYTHON:
-            tasks = [f"{t} !.sync_async" for t in SUB_TASKS]
-            # MacOS arm64 only works on server versions 6.0+
-            if host_name == "macos-arm64":
-                tasks = []
-                for version in get_versions_from("6.0"):
-                    tasks.extend(f"{t} .{version} !.sync_async" for t in SUB_TASKS)
-            host = HOSTS[host_name]
-            display_name = get_variant_name(base_display_name, host, python=python)
-            variant = create_variant(tasks, display_name, python=python, host=host)
-            variants.append(variant)
+        tasks = [".standard-non-linux"]
+        # MacOS arm64 only works on server versions 6.0+
+        if host_name == "macos-arm64":
+            tasks = [
+                f".standard-non-linux .server-{version}" for version in get_versions_from("6.0")
+            ]
+        host = HOSTS[host_name]
+        tags = ["standard-non-linux"]
+        expansions = dict()
+        if host_name == "win32":
+            expansions["IS_WIN32"] = "1"
+        display_name = get_variant_name(base_display_name, host)
+        variant = create_variant(tasks, display_name, host=host, tags=tags, expansions=expansions)
+        variants.append(variant)
 
     return variants
 
@@ -597,7 +600,7 @@ def create_server_version_tasks():
             continue
         task_types.append((python, topology, auth, ssl))
     for python, topology, auth, ssl in task_types:
-        tags = ["server-version", python, f"{topology}-{auth}-{ssl}"]
+        tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}"]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
         if python not in PYPYS:
             expansions["COVERAGE"] = "1"
@@ -610,9 +613,37 @@ def create_server_version_tasks():
     return tasks
 
 
+def create_standard_non_linux_tasks():
+    tasks = []
+
+    for (version, topology), python, sync in zip_cycle(
+        list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS, SYNCS
+    ):
+        auth = "auth" if topology == "sharded_cluster" else "noauth"
+        ssl = "nossl" if topology == "standalone" else "ssl"
+        tags = [
+            "standard-non-linux",
+            f"server-{version}",
+            f"python-{python}",
+            f"{topology}-{auth}-{ssl}",
+            sync,
+        ]
+        expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
+        name = get_task_name("test", python=python, sync=sync, **expansions)
+        server_func = FunctionCall(func="run server", vars=expansions)
+        test_vars = expansions.copy()
+        test_vars["PYTHON_VERSION"] = python
+        test_vars["TEST_NAME"] = f"default_{sync}"
+        test_func = FunctionCall(func="run tests", vars=test_vars)
+        tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
+    return tasks
+
+
 def create_server_tasks():
     tasks = []
-    for topo, version, (auth, ssl), sync in product(TOPOLOGIES, ALL_VERSIONS, AUTH_SSLS, SYNCS):
+    for topo, version, (auth, ssl), sync in product(
+        TOPOLOGIES, ALL_VERSIONS, AUTH_SSLS, [*SYNCS, "sync_async"]
+    ):
         name = f"test-{version}-{topo}-{auth}-{ssl}-{sync}".lower()
         tags = [version, topo, auth, ssl, sync]
         server_vars = dict(

.evergreen/scripts/generate_config.py

@@ -36,14 +36,15 @@
     ".replica_set .noauth .ssl",
     ".standalone .noauth .nossl",
 ]
-SYNCS = ["sync", "async", "sync_async"]
+SYNCS = ["sync", "async"]
 DISPLAY_LOOKUP = dict(
     ssl=dict(ssl="SSL", nossl="NoSSL"),
     auth=dict(auth="Auth", noauth="NoAuth"),
     topology=dict(
         standalone="Standalone", replica_set="Replica Set", sharded_cluster="Sharded Cluster"
     ),
     test_suites=dict(default="Sync", default_async="Async"),
+    sync={"sync": "Sync", "async": "Async"},
     coverage={"1": "cov"},
     no_ext={"1": "No C"},
 )

.evergreen/scripts/generate_config_utils.py

@@ -34,6 +34,7 @@
     "PYTHON_BINARY",
     "PYTHON_VERSION",
     "REQUIRE_FIPS",
+    "IS_WIN32",
 ]
 
 # Map the test name to test extra.

.evergreen/scripts/setup_tests.py

@@ -123,7 +123,11 @@ get_python_binary() {
         PYTHON="/Library/Frameworks/Python.Framework/Versions/$version/bin/python3"
     elif [ "Windows_NT" = "${OS:-}" ]; then
         version=$(echo $version | cut -d. -f1,2 | sed 's/\.//g')
-        PYTHON="C:/python/Python$version/python.exe"
+        if [ -n "${IS_WIN32:-}" ]; then
+            PYTHON="C:/python/32/Python$version/python.exe"
+        else
+            PYTHON="C:/python/Python$version/python.exe"
+        fi
     else
         PYTHON="/opt/python/$version/bin/python3"
     fi

.evergreen/utils.sh

@@ -0,0 +1,42 @@
+# Copyright 2009-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""GridFS is a specification for storing large objects in Mongo.
+
+The :mod:`gridfs` package is an implementation of GridFS on top of
+:mod:`pymongo`, exposing a file-like interface.
+
+.. seealso:: The MongoDB documentation on `gridfs <https://dochub.mongodb.org/core/gridfs>`_.
+"""
+from __future__ import annotations
+
+from gridfs.errors import NoFile
+from gridfs.grid_file_shared import DEFAULT_CHUNK_SIZE
+from gridfs.synchronous.grid_file import (
+    GridFS,
+    GridFSBucket,
+    GridIn,
+    GridOut,
+    GridOutCursor,
+)
+
+__all__ = [
+    "GridFS",
+    "GridFSBucket",
+    "NoFile",
+    "DEFAULT_CHUNK_SIZE",
+    "GridIn",
+    "GridOut",
+    "GridOutCursor",
+]