Skip to content

Commit d696857

Browse files
committed
try with pymongocrypt 1.11
1 parent 0c0a7eb commit d696857

File tree

3 files changed

+30
-33
lines changed

3 files changed

+30
-33
lines changed

.evergreen/run-tests.sh

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -136,35 +136,35 @@ if [ -n "$TEST_ENCRYPTION" ] || [ -n "$TEST_FLE_AZURE_AUTO" ] || [ -n "$TEST_FLE
136136
fi
137137

138138
python -m pip install '.[encryption]'
139-
140-
# Use the nocrypto build to avoid dependency issues with older windows/python versions.
141-
BASE=$(pwd)/libmongocrypt/nocrypto
142-
if [ -f "${BASE}/lib/libmongocrypt.so" ]; then
143-
PYMONGOCRYPT_LIB=${BASE}/lib/libmongocrypt.so
144-
elif [ -f "${BASE}/lib/libmongocrypt.dylib" ]; then
145-
PYMONGOCRYPT_LIB=${BASE}/lib/libmongocrypt.dylib
146-
elif [ -f "${BASE}/bin/mongocrypt.dll" ]; then
147-
PYMONGOCRYPT_LIB=${BASE}/bin/mongocrypt.dll
148-
# libmongocrypt's windows dll is not marked executable.
149-
chmod +x $PYMONGOCRYPT_LIB
150-
PYMONGOCRYPT_LIB=$(cygpath -m $PYMONGOCRYPT_LIB)
151-
elif [ -f "${BASE}/lib64/libmongocrypt.so" ]; then
152-
PYMONGOCRYPT_LIB=${BASE}/lib64/libmongocrypt.so
153-
else
154-
echo "Cannot find libmongocrypt shared object file"
155-
exit 1
156-
fi
157-
export PYMONGOCRYPT_LIB
158-
159-
# TODO: Test with 'pip install pymongocrypt'
160-
if [ ! -d "libmongocrypt_git" ]; then
161-
git clone https://github.com/mongodb/libmongocrypt.git libmongocrypt_git
162-
fi
163-
python -m pip install -U setuptools
164-
python -m pip install ./libmongocrypt_git/bindings/python
165-
python -c "import pymongocrypt; print('pymongocrypt version: '+pymongocrypt.__version__)"
166-
python -c "import pymongocrypt; print('libmongocrypt version: '+pymongocrypt.libmongocrypt_version())"
167-
# PATH is updated by PREPARE_SHELL for access to mongocryptd.
139+
pip install pymongocrypt==1.11
140+
# # Use the nocrypto build to avoid dependency issues with older windows/python versions.
141+
# BASE=$(pwd)/libmongocrypt/nocrypto
142+
# if [ -f "${BASE}/lib/libmongocrypt.so" ]; then
143+
# PYMONGOCRYPT_LIB=${BASE}/lib/libmongocrypt.so
144+
# elif [ -f "${BASE}/lib/libmongocrypt.dylib" ]; then
145+
# PYMONGOCRYPT_LIB=${BASE}/lib/libmongocrypt.dylib
146+
# elif [ -f "${BASE}/bin/mongocrypt.dll" ]; then
147+
# PYMONGOCRYPT_LIB=${BASE}/bin/mongocrypt.dll
148+
# # libmongocrypt's windows dll is not marked executable.
149+
# chmod +x $PYMONGOCRYPT_LIB
150+
# PYMONGOCRYPT_LIB=$(cygpath -m $PYMONGOCRYPT_LIB)
151+
# elif [ -f "${BASE}/lib64/libmongocrypt.so" ]; then
152+
# PYMONGOCRYPT_LIB=${BASE}/lib64/libmongocrypt.so
153+
# else
154+
# echo "Cannot find libmongocrypt shared object file"
155+
# exit 1
156+
# fi
157+
# export PYMONGOCRYPT_LIB
158+
159+
# # TODO: Test with 'pip install pymongocrypt'
160+
# if [ ! -d "libmongocrypt_git" ]; then
161+
# git clone https://github.com/mongodb/libmongocrypt.git libmongocrypt_git
162+
# fi
163+
# python -m pip install -U setuptools
164+
# python -m pip install ./libmongocrypt_git/bindings/python
165+
# python -c "import pymongocrypt; print('pymongocrypt version: '+pymongocrypt.__version__)"
166+
# python -c "import pymongocrypt; print('libmongocrypt version: '+pymongocrypt.libmongocrypt_version())"
167+
# # PATH is updated by PREPARE_SHELL for access to mongocryptd.
168168
fi
169169

170170
if [ -n "$TEST_ENCRYPTION" ]; then

.evergreen/scripts/prepare-resources.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ if [ "$PROJECT" = "drivers-tools" ]; then
1111
cp -R $PROJECT_DIRECTORY/ $DRIVERS_TOOLS
1212
else
1313
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
14-
pushd $DRIVERS_TOOLS
15-
git checkout 93b20d9660fa5ef82b63d541d5a6f86f80ba4503
16-
popd
1714
fi
1815
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" >$MONGO_ORCHESTRATION_HOME/orchestration.config
1916

requirements/encryption.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pymongo-auth-aws>=1.1.0,<2.0.0
2-
pymongocrypt>=1.12.0,<2.0.0
2+
pymongocrypt>=1.11.0,<2.0.0
33
certifi;os.name=='nt' or sys_platform=='darwin'

0 commit comments

Comments
 (0)