Merge remote-tracking branch 'upstream/async-improvements' into PYTHON-4725

Author: sleepyStick

.evergreen/config.yml

@@ -4,8 +4,8 @@ set -o xtrace
 
 find_python3() {
     PYTHON=""
-    # Add a fallback system python3 if it is available and Python 3.8+.
-    if is_python_38 "$(command -v python3)"; then
+    # Add a fallback system python3 if it is available and Python 3.9+.
+    if is_python_39 "$(command -v python3)"; then
         PYTHON="$(command -v python3)"
     fi
     # Find a suitable toolchain version, if available.
@@ -14,23 +14,23 @@ find_python3() {
         if [ -d "/Library/Frameworks/Python.Framework/Versions/3.10" ]; then
             PYTHON="/Library/Frameworks/Python.Framework/Versions/3.10/bin/python3"
         # macos 10.14
-        elif [ -d "/Library/Frameworks/Python.Framework/Versions/3.8" ]; then
-            PYTHON="/Library/Frameworks/Python.Framework/Versions/3.8/bin/python3"
+        elif [ -d "/Library/Frameworks/Python.Framework/Versions/3.9" ]; then
+            PYTHON="/Library/Frameworks/Python.Framework/Versions/3.9/bin/python3"
         fi
     elif [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
-        PYTHON="C:/python/Python38/python.exe"
+        PYTHON="C:/python/Python39/python.exe"
     else
-        # Prefer our own toolchain, fall back to mongodb toolchain if it has Python 3.8+.
-        if [ -f "/opt/python/3.8/bin/python3" ]; then
-            PYTHON="/opt/python/3.8/bin/python3"
-        elif is_python_38 "$(command -v /opt/mongodbtoolchain/v4/bin/python3)"; then
+        # Prefer our own toolchain, fall back to mongodb toolchain if it has Python 3.9+.
+        if [ -f "/opt/python/3.9/bin/python3" ]; then
+            PYTHON="/opt/python/3.9/bin/python3"
+        elif is_python_39 "$(command -v /opt/mongodbtoolchain/v4/bin/python3)"; then
             PYTHON="/opt/mongodbtoolchain/v4/bin/python3"
-        elif is_python_38 "$(command -v /opt/mongodbtoolchain/v3/bin/python3)"; then
+        elif is_python_39 "$(command -v /opt/mongodbtoolchain/v3/bin/python3)"; then
             PYTHON="/opt/mongodbtoolchain/v3/bin/python3"
         fi
     fi
     if [ -z "$PYTHON" ]; then
-        echo "Cannot test without python3.8+ installed!"
+        echo "Cannot test without python3.9+ installed!"
         exit 1
     fi
     echo "$PYTHON"
@@ -96,15 +96,15 @@ testinstall () {
     fi
 }
 
-# Function that returns success if the provided Python binary is version 3.8 or later
+# Function that returns success if the provided Python binary is version 3.9 or later
 # Usage:
-# is_python_38 /path/to/python
+# is_python_39 /path/to/python
 # * param1: Python binary
-is_python_38() {
+is_python_39() {
     if [ -z "$1" ]; then
         return 1
-    elif $1 -c "import sys; exit(sys.version_info[:2] < (3, 8))"; then
-        # runs when sys.version_info[:2] >= (3, 8)
+    elif $1 -c "import sys; exit(sys.version_info[:2] < (3, 9))"; then
+        # runs when sys.version_info[:2] >= (3, 9)
         return 0
     else
         return 1

.evergreen/utils.sh

@@ -39,7 +39,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         ref: ${{ inputs.ref }}
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/codeql.yml

@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           cache: 'pip'
-          python-version: 3.8
+          python-version: 3.9
           cache-dependency-path: 'pyproject.toml'
           allow-prereleases: true
 
@@ -67,7 +67,7 @@ jobs:
         # Note: the default manylinux is manylinux2014
         run: |
           python -m pip install -U pip
-          python -m pip install "cibuildwheel>=2.17,<3"
+          python -m pip install "cibuildwheel>=2.20,<3"
 
       - name: Build wheels
         env:
@@ -79,17 +79,19 @@ jobs:
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BUILD: "cp38-${{ matrix.buildplat[1] }} cp39-${{ matrix.buildplat[1] }}"
+          CIBW_BUILD: "cp39-${{ matrix.buildplat[1] }} cp39-${{ matrix.buildplat[1] }}"
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Assert all versions in wheelhouse
         if: ${{ ! startsWith(matrix.buildplat[1], 'macos') }}
         run: |
-          ls wheelhouse/*cp38*.whl
           ls wheelhouse/*cp39*.whl
           ls wheelhouse/*cp310*.whl
           ls wheelhouse/*cp311*.whl
           ls wheelhouse/*cp312*.whl
+          ls wheelhouse/*cp313*.whl
+          # Free-threading builds:
+          ls wheelhouse/*cp313t*.whl
 
       - uses: actions/upload-artifact@v4
         with:
@@ -109,7 +111,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           # Build sdist on lowest supported Python
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Build SDist
         run: |

.github/workflows/dist.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
       - name: Install Python dependencies
@@ -51,11 +51,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ["3.8", "pypy-3.9", "3.13"]
+        python-version: ["3.9", "pypy-3.9", "3.13", "3.13t"]
     name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Python
+      - if: ${{ matrix.python-version == '3.13t' }}
+        name: Setup free-threaded Python
+        uses: deadsnakes/[email protected]
+        with:
+          python-version: 3.13
+          nogil: true
+      - if: ${{ matrix.python-version != '3.13t' }}
+        name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -65,19 +72,27 @@ jobs:
       - name: Install dependencies
         run: |
           pip install -U pip
-          if [ "${{ matrix.python-version }}" == "3.13" ]; then
+          if [[ "${{ matrix.python-version }}" == "3.13" ]]; then
             pip install --pre cffi setuptools
             pip install --no-build-isolation hatch
+          elif [[ "${{ matrix.python-version }}" == "3.13t" ]]; then
+            # Hatch can't be installed on 3.13t, use pytest directly.
+            pip install .
+            pip install -r requirements/test.txt
           else
             pip install hatch
           fi
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.10.0
+        uses: supercharge/mongodb-github-action@1.11.0
         with:
           mongodb-version: 6.0
       - name: Run tests
         run: |
-          hatch run test:test
+          if [[ "${{ matrix.python-version }}" == "3.13t" ]]; then
+            pytest -v --durations=5 --maxfail=10
+          else
+            hatch run test:test
+          fi
 
   doctest:
     runs-on: ubuntu-latest
@@ -87,14 +102,14 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
       - name: Install dependencies
         run: |
           pip install -U hatch pip
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.10.0
+        uses: supercharge/mongodb-github-action@1.11.0
         with:
           mongodb-version: '8.0.0-rc4'
       - name: Run tests
@@ -111,7 +126,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
           # Build docs on lowest supported Python for furo
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install dependencies
         run: |
           pip install -U pip hatch
@@ -129,7 +144,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
           # Build docs on lowest supported Python for furo
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install dependencies
         run: |
           pip install -U pip hatch
@@ -142,7 +157,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.8", "3.11"]
+        python: ["3.9", "3.11"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -167,7 +182,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
           # Build sdist on lowest supported Python
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Build SDist
         shell: bash
         run: |
@@ -199,9 +214,9 @@ jobs:
             cache: 'pip'
             cache-dependency-path: 'sdist/test/pyproject.toml'
             # Test sdist on lowest supported Python
-            python-version: '3.8'
+            python-version: '3.9'
         - name: Start MongoDB
-          uses: supercharge/mongodb-github-action@1.10.0
+          uses: supercharge/mongodb-github-action@1.11.0
         - name: Run connect test from sdist
           shell: bash
           run: |

.github/workflows/test-python.yml

@@ -16,7 +16,7 @@ be of interest or that has already been addressed.
 
 ## Supported Interpreters
 
-PyMongo supports CPython 3.8+ and PyPy3.9+. Language features not
+PyMongo supports CPython 3.9+ and PyPy3.9+. Language features not
 supported by all interpreters can not be used.
 
 ## Style Guide

CONTRIBUTING.md

@@ -14,7 +14,7 @@ a native Python driver for MongoDB. The `gridfs` package is a
 [gridfs](https://github.com/mongodb/specifications/blob/master/source/gridfs/gridfs-spec.rst/)
 implementation on top of `pymongo`.
 
-PyMongo supports MongoDB 3.6, 4.0, 4.2, 4.4, 5.0, 6.0, 7.0, and 8.0.
+PyMongo supports MongoDB 4.0, 4.2, 4.4, 5.0, 6.0, 7.0, and 8.0.
 
 ## Support / Feedback
 
@@ -90,7 +90,7 @@ package that is incompatible with PyMongo.
 
 ## Dependencies
 
-PyMongo supports CPython 3.8+ and PyPy3.9+.
+PyMongo supports CPython 3.9+ and PyPy3.9+.
 
 Required dependencies:
 

README.md

@@ -3184,6 +3184,9 @@ static PyModuleDef_Slot _cbson_slots[] = {
     {Py_mod_exec, _cbson_exec},
 #if defined(Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED)
     {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED},
+#endif
+#if PY_VERSION_HEX >= 0x030D0000
+    {Py_mod_gil, Py_MOD_GIL_NOT_USED},
 #endif
     {0, NULL},
 };

bson/_cbsonmodule.c

@@ -1,6 +1,28 @@
 Changelog
 =========
 
+Changes in Version 4.11.0
+-------------------------
+
+.. warning:: PyMongo 4.11 drops support for Python 3.8: Python 3.9+ or PyPy 3.9+ is now required.
+.. warning:: PyMongo 4.11 drops support for MongoDB 3.6. PyMongo now supports MongoDB 4.0+.
+   Driver support for MongoDB 3.6 reached end of life in April 2024.
+
+PyMongo 4.11 brings a number of changes including:
+
+- Dropped support for Python 3.8.
+- Dropped support for MongoDB 3.6.
+- Added support for free-threaded Python with the GIL disabled. For more information see:
+  `Free-threaded CPython <https://docs.python.org/3.13/whatsnew/3.13.html#whatsnew313-free-threaded-cpython>`_.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.11 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.11 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=40784
+
 Changes in Version 4.10.1
 -------------------------
 

doc/changelog.rst

@@ -6,14 +6,14 @@ Also see the :ref:`TLSErrors` section.
 Server reports wire version X, PyMongo requires Y
 -------------------------------------------------
 
-When one attempts to connect to a <=3.4 version server, PyMongo will throw the following error::
+When one attempts to connect to a <=3.6 version server, PyMongo will throw the following error::
 
   >>> client.admin.command('ping')
   ...
-  pymongo.errors.ConfigurationError: Server at localhost:27017 reports wire version 5, but this version of PyMongo requires at least 6 (MongoDB 3.6).
+  pymongo.errors.ConfigurationError: Server at localhost:27017 reports wire version 6, but this version of PyMongo requires at least 7 (MongoDB 4.0).
 
 This is caused by the driver being too new for the server it is being run against.
-To resolve this issue either upgrade your database to version >= 3.6 or downgrade to PyMongo 3.x which supports MongoDB >= 2.6.
+To resolve this issue either upgrade your database to version >= 4.0 or downgrade to an early version of PyMongo which supports MongoDB < 4.0.
 
 
 'Cursor' object has no attribute '_Cursor__killed'