PYHON-2437 PYTHON-2873 venv improvements

Author: behackett

.evergreen/run-mockupdb-tests.sh

@@ -3,11 +3,13 @@
 set -o xtrace
 set -o errexit
 
+. .evergreen/utils.sh
+
 ${PYTHON_BINARY} setup.py clean
 cd ..
-${PYTHON_BINARY} -m virtualenv mockuptests
-. mockuptests/bin/activate
-trap "deactivate" EXIT HUP
+
+createvirtualenv ${PYTHON_BINARY} mockuptests
+trap "deactivatei, rm -rf mockuptests" EXIT HUP
 
 # Install PyMongo from git clone so mockup-tests don't
 # download it from pypi.

.evergreen/run-tests.sh

@@ -75,15 +75,13 @@ if [ -z "$PYTHON_BINARY" ]; then
  echo "Cannot test without python3.6+ installed!"
  fi
 elif [ "$COMPRESSORS" = "snappy" ]; then
- $PYTHON_BINARY -m virtualenv --never-download snappytest
- . snappytest/bin/activate
+ createvirtualenv $PYTHON_BINARY snappytest
  trap "deactivate; rm -rf snappytest" EXIT HUP
  # 0.5.2 has issues in pypy3(.5)
  pip install python-snappy==0.5.1
  PYTHON=python
 elif [ "$COMPRESSORS" = "zstd" ]; then
- $PYTHON_BINARY -m virtualenv --never-download zstdtest
- . zstdtest/bin/activate
+ createvirtualenv $PYTHON_BINARY zstdtest
  trap "deactivate; rm -rf zstdtest" EXIT HUP
  pip install zstandard
  PYTHON=python
@@ -106,7 +104,6 @@ if [ -n "$TEST_ENCRYPTION" ]; then
  PYTHON=python
 
  if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
- $PYTHON -m pip install -U setuptools
  # PYTHON-2808 Ensure this machine has the CA cert for google KMS.
  powershell.exe "Invoke-WebRequest -URI https://oauth2.googleapis.com/" > /dev/null || true
  fi

.evergreen/utils.sh

@@ -1,29 +1,39 @@
 #!/bin/bash -ex
 
+set -o xtrace
+
 # Usage:
 # createvirtualenv /path/to/python /output/path/for/venv
 # * param1: Python binary to use for the virtualenv
 # * param2: Path to the virtualenv to create
 createvirtualenv () {
  PYTHON=$1
  VENVPATH=$2
- if $PYTHON -m virtualenv --version; then
- VIRTUALENV="$PYTHON -m virtualenv --never-download"
- elif $PYTHON -m venv -h>/dev/null; then
+ if $PYTHON -m venv -h>/dev/null; then
  # System virtualenv might not be compatible with the python3 on our path
  VIRTUALENV="$PYTHON -m venv"
+ elif $PYTHON -m virtualenv --version; then
+ VIRTUALENV="$PYTHON -m virtualenv"
  else
  echo "Cannot test without virtualenv"
  exit 1
  fi
  $VIRTUALENV $VENVPATH
  if [ "Windows_NT" = "$OS" ]; then
+ # Workaround https://bugs.python.org/issue32451:
+ # mongovenv/Scripts/activate: line 3: $'\r': command not found
+ dos2unix $VENVPATH/Scripts/activate || true
  . $VENVPATH/Scripts/activate
  else
  . $VENVPATH/bin/activate
  fi
- python -m pip install --upgrade pip
- python -m pip install --upgrade setuptools wheel
+
+ PYVER=$(${PYTHON} -c "import sys; sys.stdout.write('.'.join(str(val) for val in sys.version_info[:2]))")
+ # pip fails to upgrade in a Python 3.6 venv on Windows.
+ if [ $PYVER != "3.6" -o "Windows_NT" != "$OS" ] ; then
+ python -m pip install --upgrade pip
+ python -m pip install --upgrade setuptools wheel
+ fi
 }
 
 # Usage: