Merge branch 'master' into PYTHON-5092

Author: NoahStapp

.evergreen/generated_configs/tasks.yml

@@ -817,97 +817,110 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.13/bin/python3
 
   # Ocsp tests
-  - name: ocsp-rhel8-v4.4-python3.9
+  - name: ocsp-rhel8-v4.2-python3.9
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 v4.4 Python3.9
+    display_name: OCSP RHEL8 v4.2 Python3.9
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: "4.4"
+      VERSION: "4.2"
       PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: ocsp-rhel8-v5.0-python3.10
+  - name: ocsp-rhel8-v4.4-python3.10
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 v5.0 Python3.10
+    display_name: OCSP RHEL8 v4.4 Python3.10
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: "5.0"
+      VERSION: "4.4"
       PYTHON_BINARY: /opt/python/3.10/bin/python3
-  - name: ocsp-rhel8-v6.0-python3.11
+  - name: ocsp-rhel8-v5.0-python3.11
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 v6.0 Python3.11
+    display_name: OCSP RHEL8 v5.0 Python3.11
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: "6.0"
+      VERSION: "5.0"
       PYTHON_BINARY: /opt/python/3.11/bin/python3
-  - name: ocsp-rhel8-v7.0-python3.12
+  - name: ocsp-rhel8-v6.0-python3.12
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 v7.0 Python3.12
+    display_name: OCSP RHEL8 v6.0 Python3.12
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: "7.0"
+      VERSION: "6.0"
       PYTHON_BINARY: /opt/python/3.12/bin/python3
-  - name: ocsp-rhel8-v8.0-python3.13
+  - name: ocsp-rhel8-v7.0-python3.13
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 v8.0 Python3.13
+    display_name: OCSP RHEL8 v7.0 Python3.13
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: "8.0"
+      VERSION: "7.0"
       PYTHON_BINARY: /opt/python/3.13/bin/python3
-  - name: ocsp-rhel8-rapid-pypy3.10
+  - name: ocsp-rhel8-v8.0-pypy3.10
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 rapid PyPy3.10
+    display_name: OCSP RHEL8 v8.0 PyPy3.10
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: rapid
+      VERSION: "8.0"
       PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
-  - name: ocsp-rhel8-latest-python3.9
+  - name: ocsp-rhel8-rapid-python3.9
     tasks:
       - name: .ocsp
-    display_name: OCSP RHEL8 latest Python3.9
+    display_name: OCSP RHEL8 rapid Python3.9
     run_on:
       - rhel87-small
     batchtime: 20160
     expansions:
       AUTH: noauth
       SSL: ssl
       TOPOLOGY: server
-      VERSION: latest
+      VERSION: rapid
       PYTHON_BINARY: /opt/python/3.9/bin/python3
+  - name: ocsp-rhel8-latest-python3.10
+    tasks:
+      - name: .ocsp
+    display_name: OCSP RHEL8 latest Python3.10
+    run_on:
+      - rhel87-small
+    batchtime: 20160
+    expansions:
+      AUTH: noauth
+      SSL: ssl
+      TOPOLOGY: server
+      VERSION: latest
+      PYTHON_BINARY: /opt/python/3.10/bin/python3
   - name: ocsp-win64-v4.4-python3.9
     tasks:
       - name: .ocsp-rsa !.ocsp-staple
@@ -1066,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
@@ -1078,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
@@ -1090,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
@@ -1338,6 +1390,7 @@ buildvariants:
   - name: storage-inmemory-rhel8-python3.9
     tasks:
       - name: .standalone .noauth .nossl .4.0 .sync_async
+      - name: .standalone .noauth .nossl .4.2 .sync_async
       - name: .standalone .noauth .nossl .4.4 .sync_async
       - name: .standalone .noauth .nossl .5.0 .sync_async
       - name: .standalone .noauth .nossl .6.0 .sync_async

.evergreen/generated_configs/variants.yml

@@ -26,7 +26,7 @@
 # Globals
 ##############
 
-ALL_VERSIONS = ["4.0", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
+ALL_VERSIONS = ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS
@@ -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],

.evergreen/scripts/generate_config.py

@@ -178,7 +178,7 @@ documentation including narrative docs, and the [Sphinx docstring format](https:
 You can build the documentation locally by running:
 
 ```bash
-just docs-build
+just docs
 ```
 
 When updating docs, it can be helpful to run the live docs server as:
@@ -261,6 +261,11 @@ To prevent the `synchro` hook from accidentally overwriting code, it first check
 of a file is changing and not its async counterpart, and will fail.
 In the unlikely scenario that you want to override this behavior, first export `OVERRIDE_SYNCHRO_CHECK=1`.
 
+Sometimes, the `synchro` hook will fail and introduce changes many previously unmodified files. This is due to static
+Python errors, such as missing imports, incorrect syntax, or other fatal typos. To resolve these issues,
+run `pre-commit run --all-files --hook-stage manual ruff` and fix all reported errors before running the `synchro`
+hook again.
+
 ## Converting a test to async
 The `tools/convert_test_to_async.py` script takes in an existing synchronous test file and outputs a
 partially-converted asynchronous version of the same name to the `test/asynchronous` directory.

CONTRIBUTING.md

@@ -420,3 +420,10 @@ the collection:
    DuplicateKeyError: E11000 duplicate key error index: test_database.profiles.$user_id_1 dup key: { : 212 }
 
 .. seealso:: The MongoDB documentation on `indexes <https://www.mongodb.com/docs/manual/indexes/>`_
+
+Task Cancellation
+-----------------
+`Cancelling <https://docs.python.org/3/library/asyncio-task.html#task-cancellation>`_ an asyncio Task
+that is running a PyMongo operation is treated as a fatal interrupt. Any connections, cursors, and transactions
+involved in a cancelled Task will be safely closed and cleaned up as part of the cancellation. If those resources are
+also used elsewhere, attempting to utilize them after the cancellation will result in an error.

doc/async-tutorial.rst

@@ -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(

gridfs/asynchronous/grid_file.py

@@ -391,7 +391,8 @@ async def try_next(self) -> Optional[_DocumentType]:
             if not _resumable(exc) and not exc.timeout:
                 await self.close()
             raise
-        except Exception:
+        # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.
+        except BaseException:
             await self.close()
             raise
 

pymongo/asynchronous/change_stream.py

@@ -21,7 +21,7 @@
 
 .. code-block:: python
 
-  with client.start_session(causal_consistency=True) as session:
+  async with client.start_session(causal_consistency=True) as session:
       collection = client.db.collection
       await collection.update_one({"_id": 1}, {"$set": {"x": 10}}, session=session)
       secondary_c = collection.with_options(read_preference=ReadPreference.SECONDARY)
@@ -53,16 +53,16 @@
 
   orders = client.db.orders
   inventory = client.db.inventory
-  with client.start_session() as session:
-      async with session.start_transaction():
+  async with client.start_session() as session:
+      async with await session.start_transaction():
           await orders.insert_one({"sku": "abc123", "qty": 100}, session=session)
           await inventory.update_one(
               {"sku": "abc123", "qty": {"$gte": 100}},
               {"$inc": {"qty": -100}},
               session=session,
           )
 
-Upon normal completion of ``async with session.start_transaction()`` block, the
+Upon normal completion of ``async with await session.start_transaction()`` block, the
 transaction automatically calls :meth:`AsyncClientSession.commit_transaction`.
 If the block exits with an exception, the transaction automatically calls
 :meth:`AsyncClientSession.abort_transaction`.
@@ -113,7 +113,7 @@
 .. code-block:: python
 
   # Each read using this session reads data from the same point in time.
-  with client.start_session(snapshot=True) as session:
+  async with client.start_session(snapshot=True) as session:
       order = await orders.find_one({"sku": "abc123"}, session=session)
       inventory = await inventory.find_one({"sku": "abc123"}, session=session)
 
@@ -619,7 +619,7 @@ async def callback(session):
               await inventory.update_one({"sku": "abc123", "qty": {"$gte": 100}},
                                    {"$inc": {"qty": -100}}, session=session)
 
-          with client.start_session() as session:
+          async with client.start_session() as session:
               await session.with_transaction(callback)
 
         To pass arbitrary arguments to the ``callback``, wrap your callable
@@ -628,7 +628,7 @@ async def callback(session):
           async def callback(session, custom_arg, custom_kwarg=None):
               # Transaction operations...
 
-          with client.start_session() as session:
+          async with client.start_session() as session:
               await session.with_transaction(
                   lambda s: callback(s, "custom_arg", custom_kwarg=1))
 
@@ -697,7 +697,8 @@ async def callback(session, custom_arg, custom_kwarg=None):
             )
             try:
                 ret = await callback(self)
-            except Exception as exc:
+            # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.
+            except BaseException as exc:
                 if self.in_transaction:
                     await self.abort_transaction()
                 if (

pymongo/asynchronous/client_session.py

@@ -1126,7 +1126,8 @@ async def _send_message(self, operation: Union[_Query, _GetMore]) -> None:
             self._killed = True
             await self.close()
             raise
-        except Exception:
+        # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.
+        except BaseException:
             await self.close()
             raise
 

pymongo/asynchronous/cursor.py

@@ -127,8 +127,6 @@ def _wrap_encryption_errors() -> Iterator[None]:
         # BSON encoding/decoding errors are unrelated to encryption so
         # we should propagate them unchanged.
         raise
-    except asyncio.CancelledError:
-        raise
     except Exception as exc:
         raise EncryptionError(exc) from exc
 
@@ -766,8 +764,6 @@ async def create_encrypted_collection(
                 await database.create_collection(name=name, **kwargs),
                 encrypted_fields,
             )
-        except asyncio.CancelledError:
-            raise
         except Exception as exc:
             raise EncryptedCollectionError(exc, encrypted_fields) from exc