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

Author: blink1073

.evergreen/config.yml

@@ -2582,76 +2582,100 @@ buildvariants:
 # Server tests for macOS Arm64.
 - name: test-macos-arm64-py3.9-auth-ssl-sync
   tasks:
-    - name: .standalone
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
   display_name: Test macOS Arm64 py3.9 Auth SSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-auth-ssl-async
   tasks:
-    - name: .standalone
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
   display_name: Test macOS Arm64 py3.9 Auth SSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.13-noauth-ssl-sync
   tasks:
-    - name: .replica_set
+    - name: .replica_set .6.0
+    - name: .replica_set .7.0
+    - name: .replica_set .8.0
+    - name: .replica_set .rapid
+    - name: .replica_set .latest
   display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-macos-arm64-py3.13-noauth-ssl-async
   tasks:
-    - name: .replica_set
+    - name: .replica_set .6.0
+    - name: .replica_set .7.0
+    - name: .replica_set .8.0
+    - name: .replica_set .rapid
+    - name: .replica_set .latest
   display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-macos-arm64-py3.9-noauth-nossl-sync
   tasks:
-    - name: .sharded_cluster
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
   display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
   display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Async
   run_on:
     - macos-14-arm64
   expansions:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 
 # Server tests for Windows.
 - name: test-win64-py3.9-auth-ssl-sync

.evergreen/scripts/generate_config.py

@@ -23,6 +23,7 @@
 ##############
 
 ALL_VERSIONS = ["4.0", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
+VERSIONS_6_0_PLUS = ["6.0", "7.0", "8.0", "rapid", "latest"]
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.9", "pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS
@@ -239,10 +240,14 @@ def create_server_variants() -> list[BuildVariant]:
             zip_cycle(MIN_MAX_PYTHON, AUTH_SSLS, TOPOLOGIES), SYNCS
         ):
             test_suite = "default" if sync == "sync" else "default_async"
+            tasks = [f".{topology}"]
+            # MacOS arm64 only works on server versions 6.0+
+            if host == "macos-arm64":
+                tasks = [f".{topology} .{version}" for version in VERSIONS_6_0_PLUS]
             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(
-                [f".{topology}"],
+                tasks,
                 display_name,
                 python=python,
                 host=host,