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

Author: blink1073

.evergreen/remove-unimplemented-tests.sh

@@ -41,4 +41,17 @@ rm $PYMONGO/test/crud/unified/updateMany-rawdata.json
 rm $PYMONGO/test/crud/unified/updateOne-rawdata.json
 rm $PYMONGO/test/index_management/index-rawdata.json
 
-echo "Done removing unimplemented tests\n"
+# PyMongo does not support modifyCollection
+rm $PYMONGO/test/collection_management/modifyCollection-*.json
+
+# PYTHON-5248 - Remove support for MongoDB 4.0
+rm $PYMONGO/test/**/pre-42-*.json
+
+# PYTHON-3359 - Remove Database and Collection level timeout override
+rm $PYMONGO/test/csot/override-collection-timeoutMS.json
+rm $PYMONGO/test/csot/override-database-timeoutMS.json
+
+# PYTHON-2943 - Socks5 Proxy Support
+rm $PYMONGO/test/uri_options/proxy-options.json
+
+echo "Done removing unimplemented tests"

.evergreen/scripts/resync-all-specs.py

@@ -33,7 +33,11 @@ def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
 def apply_patches():
     print("Beginning to apply patches")  # noqa: T201
     subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True)  # noqa: S603, S607
-    subprocess.run(["git apply -R --allow-empty ./.evergreen/spec-patch/*"], shell=True, check=True)  # noqa: S602, S607
+    subprocess.run(
+        ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"],  # noqa: S607
+        shell=True,  # noqa: S602
+        check=True,
+    )
 
 
 def check_new_spec_directories(directory: pathlib.Path) -> list[str]:

.evergreen/spec-patch/PYTHON-2673.patch

@@ -0,0 +1,64 @@
+diff --git a/test/load_balancer/cursors.json b/test/load_balancer/cursors.json
+index 43e4fbb4f..4e2a55fd4 100644
+--- a/test/load_balancer/cursors.json
++++ b/test/load_balancer/cursors.json
+@@ -376,7 +376,7 @@
+       ]
+     },
+     {
++      "description": "pinned connections are not returned after an network error during getMore",
+-      "description": "pinned connections are returned after an network error during getMore",
+       "operations": [
+         {
+           "name": "failPoint",
+@@ -440,7 +440,7 @@
+           "object": "testRunner",
+           "arguments": {
+             "client": "client0",
++            "connections": 1
+-            "connections": 0
+           }
+         },
+         {
+@@ -659,7 +659,7 @@
+       ]
+     },
+     {
++      "description": "pinned connections are not returned to the pool after a non-network error on getMore",
+-      "description": "pinned connections are returned to the pool after a non-network error on getMore",
+       "operations": [
+         {
+           "name": "failPoint",
+@@ -715,7 +715,7 @@
+           "object": "testRunner",
+           "arguments": {
+             "client": "client0",
++            "connections": 1
+-            "connections": 0
+           }
+         },
+         {
+diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json
+index 63aabc04d..462fa0aac 100644
+--- a/test/load_balancer/sdam-error-handling.json
++++ b/test/load_balancer/sdam-error-handling.json
+@@ -366,6 +366,9 @@
+             {
+               "connectionCreatedEvent": {}
+             },
++            {
++              "poolClearedEvent": {}
++            },
+             {
+               "connectionClosedEvent": {
+                 "reason": "error"
+@@ -378,9 +375,6 @@
+               "connectionCheckOutFailedEvent": {
+                 "reason": "connectionError"
+               }
+-            },
+-            {
+-              "poolClearedEvent": {}
+             }
+           ]
+         }

.evergreen/spec-patch/PYTHON-3712.patch

@@ -0,0 +1,14 @@
+diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
+index 4b492f7d8..e44fad1bc 100644
+--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
++++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
+@@ -5,8 +5,7 @@
+     {
+       "topologies": [
+         "single",
++        "sharded"
+-        "sharded",
+-        "sharded-replicaset"
+       ],
+       "serverless": "forbid"
+     }

.evergreen/spec-patch/PYTHON-4261.patch

@@ -0,0 +1,61 @@
+diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json
+index 830b1ea51..5eba784bf 100644
+--- a/test/server_selection_logging/replica-set.json
++++ b/test/server_selection_logging/replica-set.json
+@@ -184,7 +184,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/standalone.json b/test/server_selection_logging/standalone.json
+index 830b1ea51..5eba784bf 100644
+--- a/test/server_selection_logging/standalone.json
++++ b/test/server_selection_logging/standalone.json
+@@ -191,7 +191,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
+index 830b1ea51..5eba784bf 100644
+--- a/test/server_selection_logging/sharded.json
++++ b/test/server_selection_logging/sharded.json
+@@ -193,7 +193,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/operation-id.json
+index 830b1ea51..5eba784bf 100644
+--- a/test/server_selection_logging/operation-id.json
++++ b/test/server_selection_logging/operation-id.json
+@@ -197,7 +197,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+@@ -383,7 +383,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",

.github/workflows/codeql.yml

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

.github/workflows/test-python.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install just
         uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -65,7 +65,7 @@ jobs:
       - name: Install just
         uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
       - name: Install just
         uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -111,7 +111,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -130,7 +130,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -152,7 +152,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
         with:
           enable-cache: true
           python-version: "${{matrix.python}}"
@@ -231,7 +231,7 @@ jobs:
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
           with:
             python-version: '3.9'
         - name: Start MongoDB
@@ -257,7 +257,7 @@ jobs:
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v5
+          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
           with:
             python-version: '3.9'
         - name: Start MongoDB

.github/workflows/zizmor.yml

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

test/asynchronous/test_database.py

@@ -189,7 +189,7 @@ async def test_list_collection_names(self):
             filter={"name": {"$regex": r"^(?!system\.)"}}
         )
         for coll in no_system_collections:
-            self.assertTrue(not coll.startswith("system."))
+            self.assertFalse(coll.startswith("system."))
         self.assertIn("systemcoll.test", no_system_collections)
 
         # Force more than one batch.
@@ -265,19 +265,13 @@ async def test_list_collections(self):
             try:
                 # Found duplicate.
                 coll_cnt[coll] += 1
-                self.assertTrue(False)
+                self.fail("Found duplicate")
             except KeyError:
                 coll_cnt[coll] = 1
         coll_cnt: dict = {}
 
-        # Checking if is there any collection which don't exists.
-        if (
-            len(set(colls) - {"test", "test.mike"}) == 0
-            or len(set(colls) - {"test", "test.mike", "system.indexes"}) == 0
-        ):
-            self.assertTrue(True)
-        else:
-            self.assertTrue(False)
+        # Check if there are any collections which don't exist.
+        self.assertLessEqual(set(colls), {"test", "test.mike", "system.indexes"})
 
         colls = await (await db.list_collections(filter={"name": {"$regex": "^test$"}})).to_list()
         self.assertEqual(1, len(colls))
@@ -307,16 +301,13 @@ async def test_list_collections(self):
             try:
                 # Found duplicate.
                 coll_cnt[coll] += 1
-                self.assertTrue(False)
+                self.fail("Found duplicate")
             except KeyError:
                 coll_cnt[coll] = 1
         coll_cnt = {}
 
-        # Checking if is there any collection which don't exists.
-        if len(set(colls) - {"test"}) == 0 or len(set(colls) - {"test", "system.indexes"}) == 0:
-            self.assertTrue(True)
-        else:
-            self.assertTrue(False)
+        # Check if there are any collections which don't exist.
+        self.assertLessEqual(set(colls), {"test", "system.indexes"})
 
         await self.client.drop_database("pymongo_test")
 

test/asynchronous/test_gridfs_bucket.py

@@ -164,17 +164,16 @@ async def test_upload_ensures_index(self):
         await files.drop()
         await self.fs.upload_from_stream("filename", b"junk")
 
-        self.assertTrue(
-            any(
-                info.get("key") == [("files_id", 1), ("n", 1)]
-                for info in (await chunks.index_information()).values()
-            )
+        self.assertIn(
+            [("files_id", 1), ("n", 1)],
+            [info.get("key") for info in (await chunks.index_information()).values()],
+            "Missing required index on chunks collection: {files_id: 1, n: 1}",
         )
-        self.assertTrue(
-            any(
-                info.get("key") == [("filename", 1), ("uploadDate", 1)]
-                for info in (await files.index_information()).values()
-            )
+
+        self.assertIn(
+            [("filename", 1), ("uploadDate", 1)],
+            [info.get("key") for info in (await files.index_information()).values()],
+            "Missing required index on files collection: {filename: 1, uploadDate: 1}",
         )
 
     async def test_ensure_index_shell_compat(self):
@@ -192,11 +191,10 @@ async def test_ensure_index_shell_compat(self):
             # No error.
             await self.fs.upload_from_stream("filename", b"data")
 
-            self.assertTrue(
-                any(
-                    info.get("key") == [("filename", 1), ("uploadDate", 1)]
-                    for info in (await files.index_information()).values()
-                )
+            self.assertIn(
+                [("filename", 1), ("uploadDate", 1)],
+                [info.get("key") for info in (await files.index_information()).values()],
+                "Missing required index on files collection: {filename: 1, uploadDate: 1}",
             )
             await files.drop()