Merge branch 'master' into PYTHON-5488

Author: sleepyStick

.evergreen/generated_configs/variants.yml

@@ -535,55 +535,71 @@ buildvariants:
     display_name: "* MongoDB v4.2"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "4.2"
     tags: [coverage_tag]
   - name: mongodb-v4.4
     tasks:
       - name: .server-version
     display_name: "* MongoDB v4.4"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "4.4"
     tags: [coverage_tag]
   - name: mongodb-v5.0
     tasks:
       - name: .server-version
     display_name: "* MongoDB v5.0"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "5.0"
     tags: [coverage_tag]
   - name: mongodb-v6.0
     tasks:
       - name: .server-version
     display_name: "* MongoDB v6.0"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "6.0"
     tags: [coverage_tag]
   - name: mongodb-v7.0
     tasks:
       - name: .server-version
     display_name: "* MongoDB v7.0"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "7.0"
     tags: [coverage_tag]
   - name: mongodb-v8.0
     tasks:
       - name: .server-version
     display_name: "* MongoDB v8.0"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: "8.0"
     tags: [coverage_tag]
   - name: mongodb-rapid
     tasks:
       - name: .server-version
     display_name: "* MongoDB rapid"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: rapid
     tags: [coverage_tag]
   - name: mongodb-latest
     tasks:
       - name: .server-version
     display_name: "* MongoDB latest"
     run_on:
       - rhel87-small
+    expansions:
+      VERSION: latest
     tags: [coverage_tag]
 
   # Stable api tests

.evergreen/scripts/generate_config.py

@@ -74,7 +74,11 @@ def create_server_version_variants() -> list[BuildVariant]:
     for version in ALL_VERSIONS:
         display_name = get_variant_name("* MongoDB", version=version)
         variant = create_variant(
-            [".server-version"], display_name, host=DEFAULT_HOST, tags=["coverage_tag"]
+            [".server-version"],
+            display_name,
+            version=version,
+            host=DEFAULT_HOST,
+            tags=["coverage_tag"],
         )
         variants.append(variant)
     return variants

.github/workflows/codeql.yml

@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
+      uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
+      uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dist.yml

@@ -142,7 +142,7 @@ jobs:
     name: Download Wheels
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
       - name: Flatten directory
         working-directory: .
         run: |

.github/workflows/release-python.yml

@@ -76,7 +76,7 @@ jobs:
       id-token: write
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: all-dist-${{ github.run_id }}
           path: dist/

.github/workflows/test-python.yml

@@ -195,7 +195,7 @@ jobs:
       timeout-minutes: 20
       steps:
         - name: Download sdist
-          uses: actions/download-artifact@v4
+          uses: actions/download-artifact@v5
         - name: Unpack SDist
           shell: bash
           run: |

.github/workflows/zizmor.yml

@@ -18,4 +18,4 @@ jobs:
         with:
           persist-credentials: false
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@383d31df2eb66a2f42db98c9654bdc73231f3e3a
+        uses: zizmorcore/zizmor-action@c17832b972c15fd5f3d5065a7e16ad761a0a10d2

README.md

@@ -16,6 +16,13 @@ implementation on top of `pymongo`.
 
 PyMongo supports MongoDB 4.0, 4.2, 4.4, 5.0, 6.0, 7.0, and 8.0. PyMongo follows [semantic versioning](https://semver.org/spec/v2.0.0.html) for its releases.
 
+## Documentation
+
+Documentation is available at
+[mongodb.com](https://www.mongodb.com/docs/languages/python/pymongo-driver/current/).
+
+[API documentation](https://pymongo.readthedocs.io/en/stable/api/) and the [full changelog](https://pymongo.readthedocs.io/en/stable/changelog.html) for each release is available at [readthedocs.io](https://pymongo.readthedocs.io/en/stable/index.html).
+
 ## Support / Feedback
 
 For issues with, questions about, or feedback for PyMongo, please look
@@ -191,13 +198,6 @@ ObjectId('4aba160ee23f6b543e000002')
 [8, 11]
 ```
 
-## Documentation
-
-Documentation is available at
-[pymongo.readthedocs.io](https://pymongo.readthedocs.io/en/stable/).
-
-See the [contributing guide](./CONTRIBUTING.md#documentation) for how to build the documentation.
-
 ## Learning Resources
 
 - MongoDB Learn - [Python

bson/__init__.py

@@ -58,10 +58,10 @@
    the microsecond field is truncated.
 .. [#dt2] all datetime.datetime instances are encoded as UTC. By default, they
    are decoded as *naive* but timezone aware datetimes are also supported.
-   See :doc:`/examples/datetimes` for examples.
+   See `Dates and Times <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/dates-and-times/#dates-and-times>`_ for examples.
 .. [#dt3] To enable decoding a bson UTC datetime to a :class:`~bson.datetime_ms.DatetimeMS`
-   instance see :ref:`handling-out-of-range-datetimes`.
-.. [#uuid] For :py:class:`uuid.UUID` encoding and decoding behavior see :doc:`/examples/uuid`.
+   instance see `handling out of range datetimes <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/dates-and-times/#handling-out-of-range-datetimes>`_.
+.. [#uuid] For :py:class:`uuid.UUID` encoding and decoding behavior see `<https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#universally-unique-ids--uuids->`_.
 .. [#re] :class:`~bson.regex.Regex` instances and regular expression
    objects from ``re.compile()`` are both saved as BSON regular expressions.
    BSON regular expressions are decoded as :class:`~bson.regex.Regex`

bson/binary.py

@@ -79,7 +79,7 @@ class UuidRepresentation:
     :class:`~bson.binary.Binary` instance will be returned instead of a
     :class:`uuid.UUID` instance.
 
-    See :ref:`unspecified-representation-details` for details.
+    See `unspecified representation details <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#unspecified>`_ for details.
 
     .. versionadded:: 3.11
     """
@@ -91,7 +91,7 @@ class UuidRepresentation:
     and decoded from BSON binary, using RFC-4122 byte order with
     binary subtype :data:`UUID_SUBTYPE`.
 
-    See :ref:`standard-representation-details` for details.
+    See `standard representation details <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#standard>`_ for details.
 
     .. versionadded:: 3.11
     """
@@ -103,7 +103,7 @@ class UuidRepresentation:
     and decoded from BSON binary, using RFC-4122 byte order with
     binary subtype :data:`OLD_UUID_SUBTYPE`.
 
-    See :ref:`python-legacy-representation-details` for details.
+    See `python legacy representation details <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#python_legacy>`_ for details.
 
     .. versionadded:: 3.11
     """
@@ -115,7 +115,7 @@ class UuidRepresentation:
     and decoded from BSON binary subtype :data:`OLD_UUID_SUBTYPE`,
     using the Java driver's legacy byte order.
 
-    See :ref:`java-legacy-representation-details` for details.
+    See `Java Legacy UUID <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#java_legacy>`_ for details.
 
     .. versionadded:: 3.11
     """
@@ -127,7 +127,7 @@ class UuidRepresentation:
     and decoded from BSON binary subtype :data:`OLD_UUID_SUBTYPE`,
     using the C# driver's legacy byte order.
 
-    See :ref:`csharp-legacy-representation-details` for details.
+    See `C# Legacy UUID <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#csharp_legacy>`_ for details.
 
     .. versionadded:: 3.11
     """
@@ -328,7 +328,7 @@ def from_uuid(
         :param uuid_representation: A member of
             :class:`~bson.binary.UuidRepresentation`. Default:
             :const:`~bson.binary.UuidRepresentation.STANDARD`.
-            See :ref:`handling-uuid-data-example` for details.
+            See `UUID representations <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#universally-unique-ids--uuids->`_ for details.
 
         .. versionadded:: 3.11
         """
@@ -377,7 +377,7 @@ def as_uuid(self, uuid_representation: int = UuidRepresentation.STANDARD) -> UUI
         :param uuid_representation: A member of
             :class:`~bson.binary.UuidRepresentation`. Default:
             :const:`~bson.binary.UuidRepresentation.STANDARD`.
-            See :ref:`handling-uuid-data-example` for details.
+            See `UUID representations <https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/uuid/#universally-unique-ids--uuids->`_ for details.
 
         .. versionadded:: 3.11
         """