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

Author: blink1073

.evergreen/config.yml

@@ -2247,32 +2247,6 @@ axes:
         variables:
           MOD_WSGI_VERSION: "4"
 
-  # Install and use the driver's C-extensions?
-  - id: c-extensions
-    display_name: "C Extensions"
-    values:
-      - id: "without-c-extensions"
-        display_name: "Without C Extensions"
-        variables:
-          NO_EXT: "1"
-      - id: "with-c-extensions"
-        display_name: "With C Extensions"
-        variables:
-          NO_EXT: ""
-
-  # Choice of MongoDB storage engine
-  - id: storage-engine
-    display_name: Storage
-    values:
-      - id: mmapv1
-        display_name: MMAPv1
-        variables:
-           STORAGE_ENGINE: "mmapv1"
-      - id: inmemory
-        display_name: InMemory
-        variables:
-           STORAGE_ENGINE: "inmemory"
-
   # Run with test commands disabled on server?
   - id: disableTestCommands
     display_name: Disable test commands
@@ -3331,6 +3305,34 @@ buildvariants:
     SSL: ssl
     PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
 
+# Storage Engine tests.
+- name: storage-inmemory-rhel8-py3.9
+  tasks:
+    - name: .standalone .4.0
+    - name: .standalone .4.4
+    - name: .standalone .5.0
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
+  display_name: Storage InMemory RHEL8 py3.9
+  run_on:
+    - rhel87-small
+  expansions:
+    STORAGE_ENGINE: inmemory
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+- name: storage-mmapv1-rhel8-py3.9
+  tasks:
+    - name: .standalone .4.0
+    - name: .replica_set .4.0
+  display_name: Storage MMAPv1 RHEL8 py3.9
+  run_on:
+    - rhel87-small
+  expansions:
+    STORAGE_ENGINE: mmapv1
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+
 # Versioned API tests.
 - name: versioned-api-require-v1-rhel8-py3.9-auth
   tasks:
@@ -3445,6 +3447,89 @@ buildvariants:
     SSL: ssl
     PYTHON_BINARY: /opt/python/3.12/bin/python3
 
+# No C Ext tests.
+- name: no-c-ext-rhel8-py3.9
+  tasks:
+    - name: .standalone
+  display_name: No C Ext RHEL8 py3.9
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+- name: no-c-ext-rhel8-py3.10
+  tasks:
+    - name: .replica_set
+  display_name: No C Ext RHEL8 py3.10
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.10/bin/python3
+- name: no-c-ext-rhel8-py3.11
+  tasks:
+    - name: .sharded_cluster
+  display_name: No C Ext RHEL8 py3.11
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.11/bin/python3
+- name: no-c-ext-rhel8-py3.12
+  tasks:
+    - name: .standalone
+  display_name: No C Ext RHEL8 py3.12
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.12/bin/python3
+- name: no-c-ext-rhel8-py3.13
+  tasks:
+    - name: .replica_set
+  display_name: No C Ext RHEL8 py3.13
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.13/bin/python3
+
+# Atlas Data Lake tests.
+- name: atlas-data-lake-rhel8-py3.9-no-c
+  tasks:
+    - name: atlas-data-lake-tests
+  display_name: Atlas Data Lake RHEL8 py3.9 No C
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+- name: atlas-data-lake-rhel8-py3.9
+  tasks:
+    - name: atlas-data-lake-tests
+  display_name: Atlas Data Lake RHEL8 py3.9
+  run_on:
+    - rhel87-small
+  expansions:
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+- name: atlas-data-lake-rhel8-py3.13-no-c
+  tasks:
+    - name: atlas-data-lake-tests
+  display_name: Atlas Data Lake RHEL8 py3.13 No C
+  run_on:
+    - rhel87-small
+  expansions:
+    NO_EXT: "1"
+    PYTHON_BINARY: /opt/python/3.13/bin/python3
+- name: atlas-data-lake-rhel8-py3.13
+  tasks:
+    - name: atlas-data-lake-tests
+  display_name: Atlas Data Lake RHEL8 py3.13
+  run_on:
+    - rhel87-small
+  expansions:
+    PYTHON_BINARY: /opt/python/3.13/bin/python3
+
 - matrix_name: "tests-fips"
   matrix_spec:
     platform:
@@ -3467,32 +3552,6 @@ buildvariants:
   tasks:
     - ".6.0"
 
-- matrix_name: "tests-python-version-rhel8-without-c-extensions"
-  matrix_spec:
-    platform: rhel8
-    python-version: "*"
-    c-extensions: without-c-extensions
-    auth-ssl: noauth-nossl
-    coverage: "*"
-  exclude_spec:
-   # These interpreters are always tested without extensions.
-   - platform: rhel8
-     python-version: ["pypy3.9", "pypy3.10"]
-     c-extensions: "*"
-     auth-ssl: "*"
-     coverage: "*"
-  display_name: "${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
-  tasks: &all-server-versions
-    - ".rapid"
-    - ".latest"
-    - ".8.0"
-    - ".7.0"
-    - ".6.0"
-    - ".5.0"
-    - ".4.4"
-    - ".4.2"
-    - ".4.0"
-
 - matrix_name: "tests-python-version-supports-openssl-102-test-ssl"
   matrix_spec:
     platform: rhel7
@@ -3503,38 +3562,6 @@ buildvariants:
   tasks:
      - ".5.0"
 
-# Storage engine tests on RHEL 8.4 (x86_64) with Python 3.9.
-- matrix_name: "tests-storage-engines"
-  matrix_spec:
-    platform: rhel8
-    storage-engine: "*"
-    python-version: "3.9"
-  display_name: "Storage ${storage-engine} ${python-version} ${platform}"
-  rules:
-    - if:
-        platform: rhel8
-        storage-engine: ["inmemory"]
-        python-version: "*"
-      then:
-        add_tasks:
-          - "test-latest-standalone"
-          - "test-8.0-standalone"
-          - "test-7.0-standalone"
-          - "test-6.0-standalone"
-          - "test-5.0-standalone"
-          - "test-4.4-standalone"
-          - "test-4.2-standalone"
-          - "test-4.0-standalone"
-    - if:
-        # MongoDB 4.2 drops support for MMAPv1
-        platform: rhel8
-        storage-engine: ["mmapv1"]
-        python-version: "*"
-      then:
-        add_tasks:
-          - "test-4.0-standalone"
-          - "test-4.0-replica_set"
-
 # enableTestCommands=0 tests on RHEL 8.4 (x86_64) with Python 3.9.
 - matrix_name: "test-disableTestCommands"
   matrix_spec:
@@ -3613,16 +3640,6 @@ buildvariants:
   tasks:
     - "serverless_task_group"
 
-- matrix_name: "data-lake-spec-tests"
-  matrix_spec:
-    platform: ubuntu-22.04
-    python-version: ["3.9", "3.10"]
-    auth: "auth"
-    c-extensions: "*"
-  display_name: "Atlas Data Lake ${python-version} ${c-extensions}"
-  tasks:
-    - name: atlas-data-lake-tests
-
 # OCSP test matrix.
 - name: ocsp-test-rhel8-v4.4-py3.9
   tasks:

.evergreen/scripts/generate_config.py

@@ -111,14 +111,24 @@ def get_python_binary(python: str, host: str) -> str:
     raise ValueError(f"no match found for python {python} on {host}")
 
 
-def get_pythons_from(min_version: str) -> list[str]:
-    """Get all pythons starting from a minimum version."""
+def get_versions_from(min_version: str) -> list[str]:
+    """Get all server versions starting from a minimum version."""
     min_version_float = float(min_version)
     rapid_latest = ["rapid", "latest"]
     versions = [v for v in ALL_VERSIONS if v not in rapid_latest]
     return [v for v in versions if float(v) >= min_version_float] + rapid_latest
 
 
+def get_versions_until(max_version: str) -> list[str]:
+    """Get all server version up to a max version."""
+    max_version_float = float(max_version)
+    versions = [v for v in ALL_VERSIONS if v not in ["rapid", "latest"]]
+    versions = [v for v in versions if float(v) <= max_version_float]
+    if not len(versions):
+        raise ValueError(f"No server versions found less <= {max_version}")
+    return versions
+
+
 def get_display_name(base: str, host: str, **kwargs) -> str:
     """Get the display name of a variant."""
     display_name = f"{base} {HOSTS[host].display_name}"
@@ -250,7 +260,7 @@ def create_server_variants() -> list[BuildVariant]:
             tasks = [f".{topology}"]
             # MacOS arm64 only works on server versions 6.0+
             if host == "macos-arm64":
-                tasks = [f".{topology} .{version}" for version in get_pythons_from("6.0")]
+                tasks = [f".{topology} .{version}" for version in get_versions_from("6.0")]
             expansions = dict(AUTH=auth, SSL=ssl, TEST_SUITES=test_suite, SKIP_CSOT_TESTS="true")
             display_name = get_display_name("Test", host, python=python, **expansions)
             variant = create_variant(
@@ -337,7 +347,7 @@ def create_load_balancer_variants():
     task_names = ["load-balancer-test"]
     batchtime = BATCHTIME_WEEK
     expansions_base = dict(test_loadbalancer="true")
-    versions = get_pythons_from("6.0")
+    versions = get_versions_from("6.0")
     variants = []
     pythons = CPYTHONS + PYPYS
     for ind, (version, (auth, ssl)) in enumerate(product(versions, AUTH_SSLS)):
@@ -449,10 +459,33 @@ def create_pyopenssl_variants():
     return variants
 
 
+def create_storage_engine_tests():
+    host = "rhel8"
+    engines = ["InMemory", "MMAPv1"]
+    variants = []
+    for engine in engines:
+        python = CPYTHONS[0]
+        expansions = dict(STORAGE_ENGINE=engine.lower())
+        if engine == engines[0]:
+            tasks = [f".standalone .{v}" for v in ALL_VERSIONS]
+        else:
+            # MongoDB 4.2 drops support for MMAPv1
+            versions = get_versions_until("4.0")
+            tasks = [f".standalone .{v}" for v in versions] + [
+                f".replica_set .{v}" for v in versions
+            ]
+        display_name = get_display_name(f"Storage {engine}", host, python=python)
+        variant = create_variant(
+            tasks, display_name, host=host, python=python, expansions=expansions
+        )
+        variants.append(variant)
+    return variants
+
+
 def create_versioned_api_tests():
     host = "rhel8"
     tags = ["versionedApi_tag"]
-    tasks = [f".standalone .{v}" for v in get_pythons_from("5.0")]
+    tasks = [f".standalone .{v}" for v in get_versions_from("5.0")]
     variants = []
     types = ["require v1", "accept v2"]
 
@@ -495,10 +528,40 @@ def create_green_framework_variants():
     return variants
 
 
+def generate_no_c_ext_variants():
+    variants = []
+    host = "rhel8"
+    for python, topology in zip_cycle(CPYTHONS, TOPOLOGIES):
+        tasks = [f".{topology}"]
+        expansions = dict()
+        handle_c_ext(C_EXTS[0], expansions)
+        display_name = get_display_name("No C Ext", host, python=python)
+        variant = create_variant(
+            tasks, display_name, host=host, python=python, expansions=expansions
+        )
+        variants.append(variant)
+    return variants
+
+
+def generate_atlas_data_lake_variants():
+    variants = []
+    host = "rhel8"
+    for python, c_ext in product(MIN_MAX_PYTHON, C_EXTS):
+        tasks = ["atlas-data-lake-tests"]
+        expansions = dict()
+        handle_c_ext(c_ext, expansions)
+        display_name = get_display_name("Atlas Data Lake", host, python=python, **expansions)
+        variant = create_variant(
+            tasks, display_name, host=host, python=python, expansions=expansions
+        )
+        variants.append(variant)
+    return variants
+
+
 ##################
 # Generate Config
 ##################
 
-variants = create_green_framework_variants()
+variants = generate_atlas_data_lake_variants()
 # print(len(variants))
 generate_yaml(variants=variants)

requirements/typing.txt

@@ -1,4 +1,4 @@
-mypy==1.11.2
+mypy==1.12.1
 pyright==1.1.384
 typing_extensions
 -r ./encryption.txt