Merge branch 'master' into PYTHON-5078

Author: sleepyStick

.evergreen/generated_configs/variants.yml

@@ -1079,6 +1079,19 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
   # Server tests
+  - name: test-rhel8-python3.9-cov-no-c
+    tasks:
+      - name: .standalone .sync_async
+      - name: .replica_set .sync_async
+      - name: .sharded_cluster .sync_async
+    display_name: "* Test RHEL8 Python3.9 cov No C"
+    run_on:
+      - rhel87-small
+    expansions:
+      COVERAGE: coverage
+      NO_EXT: "1"
+      PYTHON_BINARY: /opt/python/3.9/bin/python3
+    tags: [coverage_tag]
   - name: test-rhel8-python3.9-cov
     tasks:
       - name: .standalone .sync_async
@@ -1091,6 +1104,19 @@ buildvariants:
       COVERAGE: coverage
       PYTHON_BINARY: /opt/python/3.9/bin/python3
     tags: [coverage_tag]
+  - name: test-rhel8-python3.13-cov-no-c
+    tasks:
+      - name: .standalone .sync_async
+      - name: .replica_set .sync_async
+      - name: .sharded_cluster .sync_async
+    display_name: "* Test RHEL8 Python3.13 cov No C"
+    run_on:
+      - rhel87-small
+    expansions:
+      COVERAGE: coverage
+      NO_EXT: "1"
+      PYTHON_BINARY: /opt/python/3.13/bin/python3
+    tags: [coverage_tag]
   - name: test-rhel8-python3.13-cov
     tasks:
       - name: .standalone .sync_async
@@ -1103,6 +1129,19 @@ buildvariants:
       COVERAGE: coverage
       PYTHON_BINARY: /opt/python/3.13/bin/python3
     tags: [coverage_tag]
+  - name: test-rhel8-pypy3.10-cov-no-c
+    tasks:
+      - name: .standalone .sync_async
+      - name: .replica_set .sync_async
+      - name: .sharded_cluster .sync_async
+    display_name: "* Test RHEL8 PyPy3.10 cov No C"
+    run_on:
+      - rhel87-small
+    expansions:
+      COVERAGE: coverage
+      NO_EXT: "1"
+      PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
+    tags: [coverage_tag]
   - name: test-rhel8-pypy3.10-cov
     tasks:
       - name: .standalone .sync_async

.evergreen/scripts/generate_config.py

@@ -279,8 +279,9 @@ def create_server_variants() -> list[BuildVariant]:
     host = DEFAULT_HOST
     # Prefix the display name with an asterisk so it is sorted first.
     base_display_name = "* Test"
-    for python in [*MIN_MAX_PYTHON, PYPYS[-1]]:
+    for python, c_ext in product([*MIN_MAX_PYTHON, PYPYS[-1]], C_EXTS):
         expansions = dict(COVERAGE="coverage")
+        handle_c_ext(c_ext, expansions)
         display_name = get_display_name(base_display_name, host, python=python, **expansions)
         variant = create_variant(
             [f".{t} .sync_async" for t in TOPOLOGIES],

gridfs/asynchronous/grid_file.py

@@ -231,7 +231,7 @@ async def get_version(
         try:
             doc = await anext(cursor)
             return AsyncGridOut(self._collection, file_document=doc, session=session)
-        except StopIteration:
+        except StopAsyncIteration:
             raise NoFile("no version %d for filename %r" % (version, filename)) from None
 
     async def get_last_version(

test/asynchronous/test_encryption.py

@@ -739,7 +739,7 @@ def allowable_errors(self, op):
         return errors
 
 
-async def create_test(scenario_def, test, name):
+def create_test(scenario_def, test, name):
     @async_client_context.require_test_commands
     async def run_scenario(self):
         await self.run_scenario(scenario_def, test)