Merge branch 'master' into PYTHON-4840

Author: blink1073

.evergreen/setup-spawn-host.sh

@@ -8,7 +8,8 @@ if [ -z "$1" ]
 fi
 
 target=$1
-remote_dir=/home/ec2-user/mongo-python-driver
+user=${target%@*}
+remote_dir=/home/$user/mongo-python-driver
 
 echo "Copying files to $target..."
 rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir

.evergreen/sync-spawn-host.sh

@@ -6,9 +6,10 @@ if [ -z "$1" ]
 fi
 
 target=$1
+user=${target%@*}
 
 echo "Syncing files to $target..."
-rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
+rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver
 # shellcheck disable=SC2034
-fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver; done
+fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver; done
 echo "Syncing files to $target... done."

.github/workflows/release-python.yml

@@ -67,6 +67,23 @@ jobs:
 
   publish:
     needs: [build-dist, static-scan]
+    name: Upload release to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: all-dist-${{ github.run_id }}
+          path: dist/
+      - name: Publish package distributions to PyPI
+        if: startsWith(inputs.dry_run, 'false')
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+  post-publish:
+    needs: [publish]
     runs-on: ubuntu-latest
     environment: release
     permissions:

.github/workflows/test-python.yml

@@ -87,7 +87,7 @@ jobs:
             pip install hatch
           fi
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.11.0
+        uses: supercharge/mongodb-github-action@1.12.0
         with:
           mongodb-version: 6.0
       - name: Run tests
@@ -115,7 +115,7 @@ jobs:
         run: |
           pip install -U hatch pip
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.11.0
+        uses: supercharge/mongodb-github-action@1.12.0
         with:
           mongodb-version: '8.0.0-rc4'
       - name: Run tests
@@ -230,7 +230,7 @@ jobs:
             # Test sdist on lowest supported Python
             python-version: '3.9'
         - name: Start MongoDB
-          uses: supercharge/mongodb-github-action@1.11.0
+          uses: supercharge/mongodb-github-action@1.12.0
         - name: Run connect test from sdist
           shell: bash
           run: |

_setup.py

@@ -82,6 +82,11 @@ def run(self):
             )
 
     def build_extension(self, ext):
+        # "ProgramFiles(x86)" is not a valid environment variable in Cygwin but is needed for
+        # the MSVCCompiler in distutils.
+        if os.name == "nt":
+            if "ProgramFiles" in os.environ and "ProgramFiles(x86)" not in os.environ:
+                os.environ["ProgramFiles(x86)"] = os.environ["ProgramFiles"] + " (x86)"
         name = ext.name
         try:
             build_ext.build_extension(self, ext)

doc/changelog.rst

@@ -13,7 +13,8 @@ PyMongo 4.11 brings a number of changes including:
 - Dropped support for Python 3.8.
 - Dropped support for MongoDB 3.6.
 - Dropped support for the MONGODB-CR authenticate mechanism, which is no longer supported by MongoDB 4.0+.
-- Added limited support for free-threaded Python with the GIL disabled. For more information see:
+- pymongocrypt>=1.12 is now required for :ref:`In-Use Encryption` support.
+- 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>`_.
   We do not yet support free-threaded Python on Windows (`PYTHON-5027`_) or with In-Use Encryption (`PYTHON-5024`_).
 - :attr:`~pymongo.asynchronous.mongo_client.AsyncMongoClient.address` and

pyproject.toml

@@ -212,6 +212,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
 "tools/*.py" = ["T201"]
 "green_framework_test.py" = ["T201"]
 "hatch_build.py" = ["S"]
+"_setup.py" = ["SIM112"]
 
 [tool.coverage.run]
 branch = true

requirements/encryption.txt

@@ -1,3 +1,3 @@
 pymongo-auth-aws>=1.1.0,<2.0.0
-pymongocrypt>=1.10.0,<2.0.0
+pymongocrypt>=1.12.0,<2.0.0
 certifi;os.name=='nt' or sys_platform=='darwin'

requirements/typing.txt

@@ -1,4 +1,4 @@
-mypy==1.13.0
+mypy==1.14.1
 pyright==1.1.391
 typing_extensions
 -r ./encryption.txt