Merge branch 'master' into PYTHON-4745

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
@@ -1338,6 +1351,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

.evergreen/scripts/generate_config.py

@@ -35,10 +35,9 @@ jobs:
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
         - [ubuntu-20.04, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
-        - [ubuntu-24.04-arm, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
-        # Disabled pending PYTHON-5058
-        # - [ubuntu-24.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
-        # - [ubuntu-24.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
+        - [ubuntu-20.04, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
+        - [ubuntu-20.04, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
+        - [ubuntu-20.04, "manylinux_s390x", "cp3*-manylinux_s390x"]
         - [ubuntu-20.04, "manylinux_i686", "cp3*-manylinux_i686"]
         - [windows-2019, "win_amd6", "cp3*-win_amd64"]
         - [windows-2019, "win32", "cp3*-win32"]
@@ -63,6 +62,10 @@ jobs:
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v3
         with:
+          # setup-qemu-action by default uses `tonistiigi/binfmt:latest` image,
+          # which is out of date. This causes seg faults during build.
+          # Here we manually fix the version.
+          image: tonistiigi/binfmt:qemu-v8.1.5
           platforms: all
 
       - name: Install cibuildwheel

.github/workflows/dist.yml

@@ -37,6 +37,7 @@ jobs:
   pre-publish:
     environment: release
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'mongodb' || github.event_name == 'workflow_dispatch'
     permissions:
       id-token: write
       contents: write

.github/workflows/release-python.yml

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

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

pymongo/asynchronous/client_session.py

@@ -276,17 +276,16 @@ def __init__(
         :param type_registry: instance of
             :class:`~bson.codec_options.TypeRegistry` to enable encoding
             and decoding of custom types.
-        :param datetime_conversion: Specifies how UTC datetimes should be decoded
+        :param kwargs: **Additional optional parameters available as keyword arguments:**
+
+          - `datetime_conversion` (optional): Specifies how UTC datetimes should be decoded
             within BSON. Valid options include 'datetime_ms' to return as a
             DatetimeMS, 'datetime' to return as a datetime.datetime and
             raising a ValueError for out-of-range values, 'datetime_auto' to
             return DatetimeMS objects when the underlying datetime is
             out-of-range and 'datetime_clamp' to clamp to the minimum and
             maximum possible datetimes. Defaults to 'datetime'. See
             :ref:`handling-out-of-range-datetimes` for details.
-
-          | **Other optional parameters can be passed as keyword arguments:**
-
           - `directConnection` (optional): if ``True``, forces this client to
              connect directly to the specified MongoDB host as a standalone.
              If ``false``, the client connects to the entire replica set of
@@ -1565,6 +1564,12 @@ async def close(self) -> None:
             # TODO: PYTHON-1921 Encrypted MongoClients cannot be re-opened.
             await self._encrypter.close()
         self._closed = True
+        if not _IS_SYNC:
+            await asyncio.gather(
+                self._topology.cleanup_monitors(),  # type: ignore[func-returns-value]
+                self._kill_cursors_executor.join(),  # type: ignore[func-returns-value]
+                return_exceptions=True,
+            )
 
     if not _IS_SYNC:
         # Add support for contextlib.aclosing.

pymongo/asynchronous/mongo_client.py

@@ -112,9 +112,9 @@ async def close(self) -> None:
         """
         self.gc_safe_close()
 
-    async def join(self, timeout: Optional[int] = None) -> None:
+    async def join(self) -> None:
         """Wait for the monitor to stop."""
-        await self._executor.join(timeout)
+        await self._executor.join()
 
     def request_check(self) -> None:
         """If the monitor is sleeping, wake it soon."""
@@ -189,6 +189,11 @@ def gc_safe_close(self) -> None:
         self._rtt_monitor.gc_safe_close()
         self.cancel_check()
 
+    async def join(self) -> None:
+        await asyncio.gather(
+            self._executor.join(), self._rtt_monitor.join(), return_exceptions=True
+        )  # type: ignore[func-returns-value]
+
     async def close(self) -> None:
         self.gc_safe_close()
         await self._rtt_monitor.close()