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

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -199,6 +199,98 @@ tasks:
           SUB_TEST_NAME: azure-fail
     tags: [pr]
 
+  # Min support tests
+  - name: test-min-support-python3.9-standalone-noauth-nossl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: "3.9"
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+    tags: [test-min-support]
+  - name: test-min-support-python3.9-replica-set-noauth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: "3.9"
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+    tags: [test-min-support]
+  - name: test-min-support-python3.9-sharded-cluster-auth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: "3.9"
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.9-standalone-noauth-nossl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.9
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.9-replica-set-noauth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.9
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.9-sharded-cluster-auth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.9
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.10-standalone-noauth-nossl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.10
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.10-replica-set-noauth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.10
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+    tags: [test-min-support]
+  - name: test-min-support-pypy3.10-sharded-cluster-auth-ssl
+    commands:
+      - func: run server
+      - func: run tests
+        vars:
+          UV_PYTHON: pypy3.10
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+    tags: [test-min-support]
+
   # Mod wsgi tests
   - name: mod-wsgi-replica-set-python3.10
     commands:

.evergreen/generated_configs/variants.yml

@@ -324,6 +324,14 @@ buildvariants:
     expansions:
       TEST_NAME: load_balancer
 
+  # Min support tests
+  - name: min-support-rhel8
+    tasks:
+      - name: .test-min-support
+    display_name: Min Support RHEL8
+    run_on:
+      - rhel87-small
+
   # Mockupdb tests
   - name: mockupdb-rhel8
     tasks:

.evergreen/scripts/generate_config.py

@@ -502,6 +502,12 @@ def create_aws_auth_variants():
     return variants
 
 
+def create_min_support_variants():
+    host = HOSTS["rhel8"]
+    name = get_variant_name("Min Support", host=host)
+    return [create_variant([".test-min-support"], name, host=host)]
+
+
 def create_no_server_variants():
     host = HOSTS["rhel8"]
     name = get_variant_name("No server", host=host)
@@ -891,6 +897,24 @@ def _create_ocsp_tasks(algo, variant, server_type, base_task_name):
     return tasks
 
 
+def create_min_support_tasks():
+    server_func = FunctionCall(func="run server")
+    from generate_config_utils import MIN_SUPPORT_VERSIONS
+
+    tasks = []
+    for python, topology in product(MIN_SUPPORT_VERSIONS, TOPOLOGIES):
+        auth, ssl = get_standard_auth_ssl(topology)
+        vars = dict(UV_PYTHON=python, AUTH=auth, SSL=ssl, TOPOLOGY=topology)
+        test_func = FunctionCall(func="run tests", vars=vars)
+        task_name = get_task_name(
+            "test-min-support", python=python, topology=topology, auth=auth, ssl=ssl
+        )
+        tags = ["test-min-support"]
+        commands = [server_func, test_func]
+        tasks.append(EvgTask(name=task_name, tags=tags, commands=commands))
+    return tasks
+
+
 def create_aws_lambda_tasks():
     assume_func = FunctionCall(func="assume ec2 role")
     vars = dict(TEST_NAME="aws_lambda")

.evergreen/scripts/generate_config_utils.py

@@ -24,6 +24,7 @@
 ALL_VERSIONS = ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
 CPYTHONS = ["3.10", "3.11", "3.12", "3.13", "3.14t", "3.14"]
 PYPYS = ["pypy3.11"]
+MIN_SUPPORT_VERSIONS = ["3.9", "pypy3.9", "pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS
 MIN_MAX_PYTHON = [CPYTHONS[0], CPYTHONS[-1]]
 BATCHTIME_WEEK = 10080

.github/workflows/codeql.yml

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

.github/workflows/dist.yml

@@ -83,6 +83,7 @@ jobs:
       - name: Assert all versions in wheelhouse
         if: ${{ ! startsWith(matrix.buildplat[1], 'macos') }}
         run: |
+          ls wheelhouse/*cp39*.whl
           ls wheelhouse/*cp310*.whl
           ls wheelhouse/*cp311*.whl
           ls wheelhouse/*cp312*.whl
@@ -91,7 +92,7 @@ jobs:
           # Free-threading builds:
           ls wheelhouse/*cp314t*.whl
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: wheel-${{ matrix.buildplat[1] }}
           path: ./wheelhouse/*.whl
@@ -110,7 +111,7 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           # Build sdist on lowest supported Python
-          python-version: "3.10"
+          python-version: "3.9"
 
       - name: Build SDist
         run: |
@@ -124,7 +125,7 @@ jobs:
           cd ..
           python -c "from pymongo import has_c; assert has_c()"
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: "sdist"
           path: ./dist/*.tar.gz
@@ -135,13 +136,13 @@ jobs:
     name: Download Wheels
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
       - name: Flatten directory
         working-directory: .
         run: |
           find . -mindepth 2 -type f -exec mv {} . \;
           find . -type d -empty -delete
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: all-dist-${{ github.run_id }}
           path: "./*"

.github/workflows/release-python.yml

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

.github/workflows/sbom.yml

@@ -11,6 +11,9 @@ on:
     branches: ['master']
     paths:
       - 'requirements.txt'
+      - 'requirements/**.txt'
+      - '!requirements/docs.txt'
+      - '!requirements/test.txt'
 
 permissions:
   contents: write
@@ -39,7 +42,8 @@ jobs:
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          pip install -r requirements.txt
+          python tools/generate_sbom_requirements.py
+          pip install -r sbom-requirements.txt
           pip install .
           pip uninstall -y pip setuptools
           deactivate
@@ -60,23 +64,23 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: rm -rf .venv .venv-sbom
+        run: rm -rf .venv .venv-sbom sbom-requirements.txt
 
       - name: Upload SBOM artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: sbom
           path: sbom.json
           if-no-files-found: error
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: 'chore: Update SBOM after dependency changes'
           branch: auto-update-sbom-${{ github.run_id }}
           delete-branch: true
-          title: 'chore: Update SBOM'
+          title: 'Automation: Update SBOM'
           body: |
             ## Automated SBOM Update
 

.github/workflows/test-python.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "3.10"
@@ -68,7 +68,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
@@ -87,7 +87,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "3.10"
@@ -112,7 +112,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "3.10"
@@ -131,7 +131,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "3.10"
@@ -153,7 +153,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "${{matrix.python}}"
@@ -174,7 +174,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
         with:
           enable-cache: true
           python-version: "3.10"
@@ -208,13 +208,13 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
           # Build sdist on lowest supported Python
-          python-version: "3.10"
+          python-version: "3.9"
       - name: Build SDist
         shell: bash
         run: |
           pip install build
           python -m build --sdist
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: "sdist"
           path: dist/*.tar.gz
@@ -226,7 +226,7 @@ jobs:
       timeout-minutes: 20
       steps:
         - name: Download sdist
-          uses: actions/download-artifact@v6
+          uses: actions/download-artifact@v7
           with:
             path: sdist/
         - name: Unpack SDist
@@ -242,7 +242,7 @@ jobs:
             cache: 'pip'
             cache-dependency-path: 'sdist/test/pyproject.toml'
             # Test sdist on lowest supported Python
-            python-version: "3.10"
+            python-version: "3.9"
         - id: setup-mongodb
           uses: mongodb-labs/drivers-evergreen-tools@master
         - name: Run connect test from sdist
@@ -264,9 +264,9 @@ jobs:
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7
+          uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7
           with:
-            python-version: "3.10"
+            python-version: "3.9"
         - id: setup-mongodb
           uses: mongodb-labs/drivers-evergreen-tools@master
           with:

.github/workflows/zizmor.yml

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