Skip to content

Commit 347d425

Browse files
committed
Revert "use venv"
This reverts commit 56266ce.
1 parent 56266ce commit 347d425

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

.evergreen/run-tests.sh

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ 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-
5350
if [ -z "$PYTHON_BINARY" ]; then
5451
VIRTUALENV=$(command -v virtualenv) || true
5552
if [ -z "$VIRTUALENV" ]; then
@@ -112,7 +109,6 @@ if [ -n "$TEST_PYOPENSSL" ]; then
112109
. pyopenssltest/bin/activate
113110
fi
114111
trap "deactivate; rm -rf pyopenssltest" EXIT HUP
115-
PYTHON=python
116112

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

131127
if [ -n "$TEST_ENCRYPTION" ]; then
132-
createvirtualenv $PYTHON venv-encryption
133-
trap "deactivate; rm -rf venv-encryption" EXIT HUP
134-
PYTHON=python
135-
136128
if [ -z "$LIBMONGOCRYPT_URL" ]; then
137129
echo "Cannot test client side encryption without LIBMONGOCRYPT_URL!"
138130
exit 1
@@ -160,13 +152,13 @@ if [ -n "$TEST_ENCRYPTION" ]; then
160152
exit 1
161153
fi
162154

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-
155+
git clone --branch PYTHON-2409/add-test-local-kms-python-2 git@github.com: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.
170162
fi
171163

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

0 commit comments

Comments
 (0)