cleanup

Author: blink1073

.evergreen/install-dependencies.sh

@@ -7,9 +7,6 @@ cp ${PROJECT_DIRECTORY}/test/certificates/* ${DRIVERS_TOOLS}/.evergreen/x509gen/
 # Replace MongoOrchestration's client certificate.
 cp ${PROJECT_DIRECTORY}/test/certificates/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
 
-# Ensure hatch is installed.
-bash ${PROJECT_DIRECTORY}/.evergreen/scripts/ensure-hatch.sh
-
 if [ -w /etc/hosts ]; then
   SUDO=""
 else

.evergreen/scripts/ensure-hatch.sh

@@ -2,6 +2,9 @@
 
 set -eu
 
+HERE=$(dirname ${BASH_SOURCE:-$0})
+pushd "$(dirname "$(dirname $HERE)")" > /dev/null
+
 # Ensure hatch is available.
 if [ ! -x "$(command -v hatch)" ]; then
   # Install a virtual env with "hatch"
@@ -53,3 +56,4 @@ if [ ! -x "$(command -v hatch)" ]; then
   echo "Installing hatch... done."
 fi
 hatch --version
+popd > /dev/null

.evergreen/scripts/run-mod-wsgi-tests.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eux
+set -o xtrace
+set -o errexit
 
 APACHE=$(command -v apache2 || command -v /usr/lib/apache2/mpm-prefork/apache2) || true
 if [ -n "$APACHE" ]; then
@@ -17,13 +18,11 @@ fi
 
 PYTHON_VERSION=$(${PYTHON_BINARY} -c "import sys; sys.stdout.write('.'.join(str(val) for val in sys.version_info[:2]))")
 
-# Use the installed venv.
+# Ensure the C extensions are installed.
+${PYTHON_BINARY} -m venv --system-site-packages .venv
 source .venv/bin/activate
-which pip
-pip --version
 pip install -U pip
-pip --version
-python -m pip install -v -e .
+python -m pip install -e .
 
 export MOD_WSGI_SO=/opt/python/mod_wsgi/python_version/$PYTHON_VERSION/mod_wsgi_version/$MOD_WSGI_VERSION/mod_wsgi.so
 export PYTHONHOME=/opt/python/$PYTHON_VERSION
@@ -49,3 +48,5 @@ python ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 -t 100 pa
 python ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 serial \
     http://localhost:8080/interpreter1${PROJECT_DIRECTORY} http://localhost:8080/interpreter2${PROJECT_DIRECTORY} || \
     (tail -n 100 error_log && exit 1)
+
+rm -rf .venv

.evergreen/setup-spawn-host.sh

@@ -8,9 +8,11 @@ if [ -z "$1" ]
 fi
 
 target=$1
+remote_dir=/home/ec2-user/mongo-python-driver
 
 echo "Copying files to $target..."
-rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
+rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir
 echo "Copying files to $target... done"
 
-ssh $target /home/ec2-user/mongo-python-driver/.evergreen/scripts/setup-system.sh
+ssh $target $remote_dir/.evergreen/scripts/setup-system.sh
+ssh $target "PYTHON_BINARY=${PYTHON_BINARY:-} $remote_dir/.evergreen/scripts/ensure-hatch.sh"