Skip to content

Commit 56266ce

Browse files
committed
use venv
1 parent ea7e619 commit 56266ce

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

.evergreen/run-tests.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ if [ "$SSL" != "nossl" ]; then
4747
export CA_PEM="$DRIVERS_TOOLS/.evergreen/x509gen/ca.pem"
4848
fi
4949

50+
# For createvirtualenv.
51+
. .evergreen/utils.sh
52+
5053
if [ -z "$PYTHON_BINARY" ]; then
5154
VIRTUALENV=$(command -v virtualenv) || true
5255
if [ -z "$VIRTUALENV" ]; then
@@ -109,6 +112,7 @@ if [ -n "$TEST_PYOPENSSL" ]; then
109112
. pyopenssltest/bin/activate
110113
fi
111114
trap "deactivate; rm -rf pyopenssltest" EXIT HUP
115+
PYTHON=python
112116

113117
IS_PYTHON_2=$(python -c "import sys; sys.stdout.write('1' if sys.version_info < (3,) else '0')")
114118
if [ $IS_PYTHON_2 = "1" ]; then
@@ -125,6 +129,10 @@ if [ -n "$TEST_PYOPENSSL" ]; then
125129
fi
126130

127131
if [ -n "$TEST_ENCRYPTION" ]; then
132+
createvirtualenv $PYTHON venv-encryption
133+
trap "deactivate; rm -rf venv-encryption" EXIT HUP
134+
PYTHON=python
135+
128136
if [ -z "$LIBMONGOCRYPT_URL" ]; then
129137
echo "Cannot test client side encryption without LIBMONGOCRYPT_URL!"
130138
exit 1
@@ -152,13 +160,13 @@ if [ -n "$TEST_ENCRYPTION" ]; then
152160
exit 1
153161
fi
154162

155-
git clone --branch PYTHON-2409/add-test-local-kms-python-2 [email protected]:prashantmital/libmongocrypt.git libmongocrypt_git
156-
$PYTHON -m pip install --upgrade ./libmongocrypt_git/bindings/python
157-
# TODO: use a virtualenv
158-
trap "$PYTHON -m pip uninstall -y pymongocrypt" EXIT HUP
159-
$PYTHON -c "import pymongocrypt; print('pymongocrypt version: '+pymongocrypt.__version__)"
160-
$PYTHON -c "import pymongocrypt; print('libmongocrypt version: '+pymongocrypt.libmongocrypt_version())"
161-
# PATH is set by PREPARE_SHELL.
163+
# TODO: Test with 'pip install pymongocrypt'
164+
git clone --branch master https://github.com/mongodb/libmongocrypt.git libmongocrypt_git
165+
python -m pip install --upgrade ./libmongocrypt_git/bindings/python
166+
python -c "import pymongocrypt; print('pymongocrypt version: '+pymongocrypt.__version__)"
167+
python -c "import pymongocrypt; print('libmongocrypt version: '+pymongocrypt.libmongocrypt_version())"
168+
# PATH is updated by PREPARE_SHELL for access to mongocryptd.
169+
162170
fi
163171

164172
PYTHON_IMPL=$($PYTHON -c "import platform, sys; sys.stdout.write(platform.python_implementation())")

0 commit comments

Comments
 (0)