Merge branch 'master' into PYTHON-4493-prod

Author: NoahStapp

.evergreen/config.yml

@@ -1430,10 +1430,10 @@ buildvariants:
     - debian11-small
   tasks:
     - name: test-gcpkms
-      batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
+      batchtime: 10080  # 7 days
     - name: test-gcpkms-fail
     - name: test-azurekms
-      batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
+      batchtime: 10080  # 7 days
     - name: test-azurekms-fail
 
 - name: rhel8-test-lambda

.evergreen/generated_configs/variants.yml

@@ -823,7 +823,7 @@ buildvariants:
     display_name: OCSP RHEL8 v4.4 Python3.9
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -836,7 +836,7 @@ buildvariants:
     display_name: OCSP RHEL8 v5.0 Python3.10
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -849,7 +849,7 @@ buildvariants:
     display_name: OCSP RHEL8 v6.0 Python3.11
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -862,7 +862,7 @@ buildvariants:
     display_name: OCSP RHEL8 v7.0 Python3.12
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -875,7 +875,7 @@ buildvariants:
     display_name: OCSP RHEL8 v8.0 Python3.13
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -888,7 +888,7 @@ buildvariants:
     display_name: OCSP RHEL8 rapid PyPy3.10
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -901,7 +901,7 @@ buildvariants:
     display_name: OCSP RHEL8 latest Python3.9
     run_on:
       - rhel87-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -914,7 +914,7 @@ buildvariants:
     display_name: OCSP Win64 v4.4 Python3.9
     run_on:
       - windows-64-vsMulti-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -927,7 +927,7 @@ buildvariants:
     display_name: OCSP Win64 v8.0 Python3.13
     run_on:
       - windows-64-vsMulti-small
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -940,7 +940,7 @@ buildvariants:
     display_name: OCSP macOS v4.4 Python3.9
     run_on:
       - macos-14
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -953,7 +953,7 @@ buildvariants:
     display_name: OCSP macOS v8.0 Python3.13
     run_on:
       - macos-14
-    batchtime: 20160
+    batchtime: 10080
     expansions:
       AUTH: noauth
       SSL: ssl
@@ -971,21 +971,21 @@ buildvariants:
     display_name: Auth OIDC Ubuntu-22
     run_on:
       - ubuntu2204-small
-    batchtime: 20160
+    batchtime: 10080
   - name: auth-oidc-macos
     tasks:
       - name: testoidc_task_group
     display_name: Auth OIDC macOS
     run_on:
       - macos-14
-    batchtime: 20160
+    batchtime: 10080
   - name: auth-oidc-win64
     tasks:
       - name: testoidc_task_group
     display_name: Auth OIDC Win64
     run_on:
       - windows-64-vsMulti-small
-    batchtime: 20160
+    batchtime: 10080
 
   # Pyopenssl tests
   - name: pyopenssl-macos-python3.9

.evergreen/scripts/generate_config.py

@@ -234,7 +234,7 @@ def generate_yaml(tasks=None, variants=None):
 
 def create_ocsp_variants() -> list[BuildVariant]:
     variants = []
-    batchtime = BATCHTIME_WEEK * 2
+    batchtime = BATCHTIME_WEEK
     expansions = dict(AUTH="noauth", SSL="ssl", TOPOLOGY="server")
     base_display = "OCSP"
 
@@ -674,7 +674,7 @@ def create_oidc_auth_variants():
                 tasks,
                 get_display_name("Auth OIDC", host),
                 host=host,
-                batchtime=BATCHTIME_WEEK * 2,
+                batchtime=BATCHTIME_WEEK,
             )
         )
     return variants

.evergreen/scripts/setup-dev-env.sh

@@ -43,8 +43,18 @@ if [ -z "${PYMONGO_BIN_DIR:-}" ]; then
   export PATH="$PATH:$HOME/.local/bin"
 fi
 
+# Set up venv, making sure c extensions build unless disabled.
+if [ -z "${NO_EXT:-}" ]; then
+  export PYMONGO_C_EXT_MUST_BUILD=1
+fi
+# Set up visual studio env on Windows spawn hosts.
+if [ -f $HOME/.visualStudioEnv.sh ]; then
+  set +u
+  SSH_TTY=1 source $HOME/.visualStudioEnv.sh
+  set -u
+fi
 uv sync --frozen
-uv run --frozen --with pip pip install -e .
+
 echo "Setting up python environment... done."
 
 # Ensure there is a pre-commit hook if there is a git checkout.

.github/workflows/dist.yml

@@ -34,11 +34,11 @@ jobs:
         # Github Actions doesn't support pairing matrix values together, let's improvise
         # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
         buildplat:
-        - [ubuntu-20.04, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
-        - [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"]
+        - [ubuntu-latest, "manylinux_x86_64", "cp3*-manylinux_x86_64"]
+        - [ubuntu-latest, "manylinux_aarch64", "cp3*-manylinux_aarch64"]
+        - [ubuntu-latest, "manylinux_ppc64le", "cp3*-manylinux_ppc64le"]
+        - [ubuntu-latest, "manylinux_s390x", "cp3*-manylinux_s390x"]
+        - [ubuntu-latest, "manylinux_i686", "cp3*-manylinux_i686"]
         - [windows-2019, "win_amd6", "cp3*-win_amd64"]
         - [windows-2019, "win32", "cp3*-win32"]
         - [macos-14, "macos", "cp*-macosx_*"]

.github/workflows/test-python.yml

@@ -54,7 +54,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         python-version: ["3.9", "pypy-3.10", "3.13", "3.13t"]
     name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:

test/asynchronous/test_pooling.py

@@ -123,9 +123,12 @@ async def run_mongo_thread(self):
 
         self.state = "connection"
 
-    def __del__(self):
-        if _IS_SYNC and self.sock:
-            self.sock.close_conn(None)
+    async def release_conn(self):
+        if self.sock:
+            await self.sock.unpin()
+            self.sock = None
+            return True
+        return False
 
 
 async def run_cases(client, cases):
@@ -352,6 +355,10 @@ async def test_no_wait_queue_timeout(self):
 
         self.assertEqual(t.state, "connection")
         self.assertEqual(t.sock, s1)
+        # Cleanup
+        await t.release_conn()
+        await t.join()
+        await pool.close()
 
     async def test_checkout_more_than_max_pool_size(self):
         pool = await self.create_pool(max_pool_size=2)
@@ -364,16 +371,26 @@ async def test_checkout_more_than_max_pool_size(self):
                 socks.append(sock)
 
         tasks = []
-        for _ in range(30):
+        for _ in range(10):
             t = SocketGetter(self.c, pool)
             await t.start()
             tasks.append(t)
         await asyncio.sleep(1)
         for t in tasks:
             self.assertEqual(t.state, "get_socket")
-
+        # Cleanup
         for socket_info in socks:
-            await socket_info.close_conn(None)
+            await socket_info.unpin()
+        while tasks:
+            to_remove = []
+            for t in tasks:
+                if await t.release_conn():
+                    to_remove.append(t)
+                    await t.join()
+            for t in to_remove:
+                tasks.remove(t)
+            await asyncio.sleep(0.05)
+        await pool.close()
 
     async def test_maxConnecting(self):
         client = await self.async_rs_or_single_client()

test/test_pooling.py

@@ -123,9 +123,12 @@ def run_mongo_thread(self):
 
         self.state = "connection"
 
-    def __del__(self):
-        if _IS_SYNC and self.sock:
-            self.sock.close_conn(None)
+    def release_conn(self):
+        if self.sock:
+            self.sock.unpin()
+            self.sock = None
+            return True
+        return False
 
 
 def run_cases(client, cases):
@@ -352,6 +355,10 @@ def test_no_wait_queue_timeout(self):
 
         self.assertEqual(t.state, "connection")
         self.assertEqual(t.sock, s1)
+        # Cleanup
+        t.release_conn()
+        t.join()
+        pool.close()
 
     def test_checkout_more_than_max_pool_size(self):
         pool = self.create_pool(max_pool_size=2)
@@ -364,16 +371,26 @@ def test_checkout_more_than_max_pool_size(self):
                 socks.append(sock)
 
         tasks = []
-        for _ in range(30):
+        for _ in range(10):
             t = SocketGetter(self.c, pool)
             t.start()
             tasks.append(t)
         time.sleep(1)
         for t in tasks:
             self.assertEqual(t.state, "get_socket")
-
+        # Cleanup
         for socket_info in socks:
-            socket_info.close_conn(None)
+            socket_info.unpin()
+        while tasks:
+            to_remove = []
+            for t in tasks:
+                if t.release_conn():
+                    to_remove.append(t)
+                    t.join()
+            for t in to_remove:
+                tasks.remove(t)
+            time.sleep(0.05)
+        pool.close()
 
     def test_maxConnecting(self):
         client = self.rs_or_single_client()