mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-2575 Fix crypto test deps

Browse Source 
Also resolves PYTHON-2577 and PYTHON-2780
This commit is contained in:
Bernie Hackett 2021-06-25 23:11:21 -07:00
parent b0b3ba4ce9
commit ee97eae027
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.evergreen/config.yml
View File

@ -74,7 +74,7 @@ functions:
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
export PATH="$MONGODB_BINARIES:$PATH"
export PATH="$MONGODB_BINARIES:/home/admin/.cargo/bin:$PATH"
export PROJECT="${project}"
EOT
# See what we've done

2
.evergreen/run-atlas-tests.sh
View File

@ -35,7 +35,7 @@ else
IS_PRE_279=$(python -c "import sys; sys.stdout.write('1' if sys.version_info < (2, 7, 9) else '0')")
if [ $IS_PRE_279 = "1" ]; then
echo "Using a Pre-2.7.9 CPython"
python -m pip install pyopenssl>=17.2.0 service_identity>18.1.0
python -m pip install -r .evergreen/test-pyopenssl-requirements.txt
else
echo "Using CPython 2.7.9+"
fi

2
.evergreen/run-ocsp-tests.sh
View File

@ -20,6 +20,6 @@ fi
createvirtualenv $PYTHON ocsptest
trap "deactivate; rm -rf ocsptest" EXIT HUP
python -m pip install --prefer-binary pyopenssl requests service_identity
python -m pip install --prefer-binary -r .evergreen/test-pyopenssl-requirements.txt
OCSP_TLS_SHOULD_SUCCEED=${OCSP_TLS_SHOULD_SUCCEED} CA_FILE=${CA_FILE} python test/ocsp/test_ocsp.py

4
.evergreen/run-tests.sh
View File

@ -75,7 +75,7 @@ if [ -z "$PYTHON_BINARY" ]; then
exit 1
fi
else
$VIRTUALENV pymongotestvenv
$VIRTUALENV --never-download pymongotestvenv
. pymongotestvenv/bin/activate
PYTHON=python
trap "deactivate; rm -rf pymongotestvenv" EXIT HUP
@ -114,7 +114,7 @@ if [ -n "$TEST_PYOPENSSL" ]; then
trap "deactivate; rm -rf pyopenssltest" EXIT HUP
PYTHON=python
python -m pip install --prefer-binary pyopenssl requests service_identity
python -m pip install --prefer-binary -r .evergreen/test-pyopenssl-requirements.txt
fi
if [ -n "$TEST_ENCRYPTION" ]; then

5
.evergreen/test-encryption-requirements.txt
View File

@ -1,6 +1,9 @@
# cffi==1.14.3 was the last installable release on RHEL 6.2 with Python 3.4
cffi==1.14.3;python_version=="3.4"
cffi>=1.12.0,<2;python_version!="3.4"
cryptography>=2
cryptography>=2,<3.4;python_version=="2.7"
cryptography>=2,<2.9;python_version=="3.4"
cryptography>=2,<3.3;python_version=="3.5"
cryptography>=2;python_version>"3.5"
# boto3 is required by drivers-evergreen-tools/.evergreen/csfle/set-temp-creds.sh
boto3<2

8
.evergreen/test-pyopenssl-requirements.txt Normal file
View File

@ -0,0 +1,8 @@
-r test-encryption-requirements.txt
pyopenssl>=17.2.0,<20;python_version=="3.4"
pyopenssl>=17.2.0;python_version!="3.4"
attrs<=20.3.0;python_version=="3.4"
service-identity==18.1.0;python_version=="3.4"
service-identity>=18.1.0;python_version!="3.4"
requests<2.22;python_version=="3.4"
requests<3.0;python_version!="3.4"