Skip to content

Commit fd5a105

Browse files
authored
PYTHON-5016 Update scripts to handle Windows spawn hosts (mongodb#2047)
1 parent a0de09e commit fd5a105

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

.evergreen/setup-spawn-host.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if [ -z "$1" ]
88
fi
99

1010
target=$1
11-
remote_dir=/home/ec2-user/mongo-python-driver
11+
user=${target%@*}
12+
remote_dir=/home/$user/mongo-python-driver
1213

1314
echo "Copying files to $target..."
1415
rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir

.evergreen/sync-spawn-host.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ if [ -z "$1" ]
66
fi
77

88
target=$1
9+
user=${target%@*}
910

1011
echo "Syncing files to $target..."
11-
rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
12+
rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver
1213
# shellcheck disable=SC2034
13-
fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver; done
14+
fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/$user/mongo-python-driver; done
1415
echo "Syncing files to $target... done."

_setup.py

+5
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ def run(self):
8282
)
8383

8484
def build_extension(self, ext):
85+
# "ProgramFiles(x86)" is not a valid environment variable in Cygwin but is needed for
86+
# the MSVCCompiler in distutils.
87+
if os.name == "nt":
88+
if "ProgramFiles" in os.environ and "ProgramFiles(x86)" not in os.environ:
89+
os.environ["ProgramFiles(x86)"] = os.environ["ProgramFiles"] + " (x86)"
8590
name = ext.name
8691
try:
8792
build_ext.build_extension(self, ext)

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
212212
"tools/*.py" = ["T201"]
213213
"green_framework_test.py" = ["T201"]
214214
"hatch_build.py" = ["S"]
215+
"_setup.py" = ["SIM112"]
215216

216217
[tool.coverage.run]
217218
branch = true

0 commit comments

Comments
 (0)