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

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -292,32 +292,32 @@ buildvariants:
       AUTH: auth
 
   # Free threaded tests
-  - name: free-threaded-rhel8-python3.13t
+  - name: free-threaded-rhel8-python3.14t
     tasks:
       - name: .free-threading
-    display_name: Free-threaded RHEL8 Python3.13t
+    display_name: Free-threaded RHEL8 Python3.14t
     run_on:
       - rhel87-small
     expansions:
-      PYTHON_BINARY: /opt/python/3.13t/bin/python3
+      PYTHON_BINARY: /opt/python/3.14t/bin/python3
     tags: [pr]
-  - name: free-threaded-macos-python3.13t
+  - name: free-threaded-macos-python3.14t
     tasks:
       - name: .free-threading
-    display_name: Free-threaded macOS Python3.13t
+    display_name: Free-threaded macOS Python3.14t
     run_on:
       - macos-14
     expansions:
-      PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t
+      PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.14/bin/python3t
     tags: []
-  - name: free-threaded-macos-arm64-python3.13t
+  - name: free-threaded-macos-arm64-python3.14t
     tasks:
       - name: .free-threading
-    display_name: Free-threaded macOS Arm64 Python3.13t
+    display_name: Free-threaded macOS Arm64 Python3.14t
     run_on:
       - macos-14-arm64
     expansions:
-      PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t
+      PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.14/bin/python3t
     tags: []
   - name: free-threaded-win64-python3.14t
     tasks:
@@ -332,24 +332,20 @@ buildvariants:
   # Green framework tests
   - name: green-eventlet-rhel8
     tasks:
-      - name: .test-standard .standalone-noauth-nossl .python-3.9
+      - name: .test-standard .standalone-noauth-nossl .python-3.9 .sync
     display_name: Green Eventlet RHEL8
     run_on:
       - rhel87-small
     expansions:
       GREEN_FRAMEWORK: eventlet
-      AUTH: auth
-      SSL: ssl
   - name: green-gevent-rhel8
     tasks:
-      - name: .test-standard .standalone-noauth-nossl
+      - name: .test-standard .standalone-noauth-nossl .sync
     display_name: Green Gevent RHEL8
     run_on:
       - rhel87-small
     expansions:
       GREEN_FRAMEWORK: gevent
-      AUTH: auth
-      SSL: ssl
 
   # Import time tests
   - name: import-time

.evergreen/generated_configs/variants.yml

@@ -107,10 +107,7 @@ def create_standard_nonlinux_variants() -> list[BuildVariant]:
 def create_free_threaded_variants() -> list[BuildVariant]:
     variants = []
     for host_name in ("rhel8", "macos", "macos-arm64", "win64"):
-        if host_name == "win64":
-            python = "3.14t"
-        else:
-            python = "3.13t"
+        python = "3.14t"
         tasks = [".free-threading"]
         tags = []
         if host_name == "rhel8":
@@ -300,12 +297,12 @@ def create_green_framework_variants():
     variants = []
     host = DEFAULT_HOST
     for framework in ["eventlet", "gevent"]:
-        tasks = [".test-standard .standalone-noauth-nossl"]
+        tasks = [".test-standard .standalone-noauth-nossl .sync"]
         if framework == "eventlet":
             # Eventlet has issues with dnspython > 2.0 and newer versions of CPython
             # https://jira.mongodb.org/browse/PYTHON-5284
-            tasks = [".test-standard .standalone-noauth-nossl .python-3.9"]
-        expansions = dict(GREEN_FRAMEWORK=framework, AUTH="auth", SSL="ssl")
+            tasks = [".test-standard .standalone-noauth-nossl .python-3.9 .sync"]
+        expansions = dict(GREEN_FRAMEWORK=framework)
         display_name = get_variant_name(f"Green {framework.capitalize()}", host)
         variant = create_variant(tasks, display_name, host=host, expansions=expansions)
         variants.append(variant)
@@ -636,20 +633,15 @@ def create_test_non_standard_tasks():
 def create_standard_tasks():
     """For variants that do not set a TEST_NAME."""
     tasks = []
-    task_combos = []
-    # For each version and topology, rotate through the CPythons and sync/async.
-    for (version, topology), python, sync in zip_cycle(
-        list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS, SYNCS
-    ):
-        pr = version == "latest"
-        task_combos.append((version, topology, python, sync, pr))
-    # For each PyPy and topology, rotate through the the versions and sync/async.
-    for (python, topology), version, sync in zip_cycle(
-        list(product(PYPYS, TOPOLOGIES)), ALL_VERSIONS, SYNCS
+    task_combos = set()
+    # For each python and topology and sync/async, rotate through the the versions.
+    for (python, topology, sync), version in zip_cycle(
+        list(product(CPYTHONS + PYPYS, TOPOLOGIES, SYNCS)), ALL_VERSIONS
     ):
-        task_combos.append((version, topology, python, sync, False))
+        pr = version == "latest" and python not in PYPYS
+        task_combos.add((version, topology, python, sync, pr))
 
-    for version, topology, python, sync, pr in task_combos:
+    for version, topology, python, sync, pr in sorted(task_combos):
         auth, ssl = get_standard_auth_ssl(topology)
         tags = [
             "test-standard",

.evergreen/scripts/generate_config.py

@@ -22,7 +22,7 @@
 ##############
 
 ALL_VERSIONS = ["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"]
+CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
 PYPYS = ["pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS
 MIN_MAX_PYTHON = [CPYTHONS[0], CPYTHONS[-1]]

.evergreen/scripts/generate_config_utils.py

@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3
+      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # 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@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3
+      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/codeql.yml

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

.github/workflows/zizmor.yml

@@ -5,6 +5,11 @@ Changes in Version 4.14.0 (XXXX/XX/XX)
 --------------------------------------
 PyMongo 4.14 brings a number of changes including:
 
+- Added preliminary support for Python 3.14 and 3.14 with free-threading.  We do not yet support the following with Python 3.14:
+    - Subinterpreters (``concurrent.interpreters``)
+    - Free-threading with Encryption
+    - mod_wsgi
+- Removed experimental support for free-threading support in Python 3.13.
 - Added :attr:`bson.codec_options.TypeRegistry.codecs` and :attr:`bson.codec_options.TypeRegistry.fallback_encoder` properties
   to allow users to directly access the type codecs and fallback encoder for a given :class:`bson.codec_options.TypeRegistry`.
 - Added :meth:`pymongo.asynchronous.mongo_client.AsyncMongoClient.append_metadata` and

doc/changelog.rst

@@ -614,7 +614,7 @@ An application using Azure credentials would look like, this time using
     from pymongo.encryption_options import AutoEncryptionOpts
 
     # The empty dictionary enables on-demand credentials.
-    kms_providers = ({"azure": {}},)
+    kms_providers = {"azure": {}}
     key_vault_namespace = "keyvault.datakeys"
     auto_encryption_opts = AutoEncryptionOpts(kms_providers, key_vault_namespace)
     client = MongoClient(auto_encryption_opts=auto_encryption_opts)
@@ -647,7 +647,7 @@ as demonstrated by the following example:
   import os
   from bson.codec_options import CodecOptions
   from pymongo import MongoClient
-  from pymongo.encryption import Algorithm, ClientEncryption, QueryType
+  from pymongo.encryption import ClientEncryption
   from pymongo.encryption_options import AutoEncryptionOpts
 
   local_master_key = os.urandom(96)
@@ -670,8 +670,6 @@ as demonstrated by the following example:
 
   encrypted_fields_map = {
       "default.encryptedCollection": {
-          "escCollection": "encryptedCollection.esc",
-          "ecocCollection": "encryptedCollection.ecoc",
           "fields": [
               {
                   "path": "firstName",
@@ -768,8 +766,6 @@ using an ``encrypted_fields`` mapping, as demonstrated by the following example:
         unindexed_key_id = client_encryption.create_data_key("local")
 
         encrypted_fields = {
-            "escCollection": "enxcol_.default.esc",
-            "ecocCollection": "enxcol_.default.ecoc",
             "fields": [
                 {
                     "keyId": indexed_key_id,

doc/examples/encryption.rst

@@ -50,11 +50,12 @@ dev = [
     "pre-commit>=4.0"
 ]
 pip = ["pip"]
-gevent = ["gevent"]
+# TODO: PYTHON-5464
+gevent = ["gevent", "cffi>=2.0.0b1;python_version=='3.14'"]
 eventlet = ["eventlet"]
 coverage = [
     "pytest-cov",
-    "coverage>=5,<=7.5"
+    "coverage>=5,<=7.10.2"
 ]
 mockupdb = [
     "mockupdb@git+https://github.com/mongodb-labs/mongo-mockup-db@master"
@@ -64,8 +65,8 @@ pymongocrypt_source = [
 ]
 perf = ["simplejson"]
 typing = [
-    "mypy==1.14.1",
-    "pyright==1.1.392.post0",
+    "mypy==1.17.1",
+    "pyright==1.1.403",
     "typing_extensions",
     "pip"
 ]

pyproject.toml

@@ -369,7 +369,12 @@ async def test_explain_csot(self):
         client = await self.async_rs_or_single_client(event_listeners=[listener])
 
         # Create a collection, referred to as collection, with the namespace explain-test.collection.
-        collection = client["explain-test"]["collection"]
+        # Workaround for SERVER-108463
+        names = await client["explain-test"].list_collection_names()
+        if "collection" not in names:
+            collection = await client["explain-test"].create_collection("collection")
+        else:
+            collection = client["explain-test"]["collection"]
 
         # Run an explained find on collection. The find will have the query predicate { name: 'john doe' }. Specify a maxTimeMS value of 2000ms for the explain.
         with pymongo.timeout(2.0):