diff --git a/.evergreen/setup-spawn-host.sh b/.evergreen/setup-spawn-host.sh index 1a526c762..4109e5918 100755 --- a/.evergreen/setup-spawn-host.sh +++ b/.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 diff --git a/.evergreen/sync-spawn-host.sh b/.evergreen/sync-spawn-host.sh index 3d6c96890..de3374a00 100755 --- a/.evergreen/sync-spawn-host.sh +++ b/.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." diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 12cfaa4b2..2310b7698 100644 --- a/.github/workflows/test-python.yml +++ b/.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: | diff --git a/_setup.py b/_setup.py index 65ae1908f..1a8b9e024 100644 --- a/_setup.py +++ b/_setup.py @@ -82,6 +82,11 @@ https://pymongo.readthedocs.io/en/stable/installation.html#osx ) 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) diff --git a/pyproject.toml b/pyproject.toml index 9a29a777f..a9977a382 100644 --- a/pyproject.toml +++ b/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 diff --git a/requirements/typing.txt b/requirements/typing.txt index 189f4f871..5a2f76f6b 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -1,4 +1,4 @@ -mypy==1.13.0 +mypy==1.14.1 pyright==1.1.391 typing_extensions -r ./encryption.txt