Skip to content

Commit ee97eae

Browse files
committed
PYTHON-2575 Fix crypto test deps
Also resolves PYTHON-2577 and PYTHON-2780
1 parent b0b3ba4 commit ee97eae

6 files changed

+17
-6
lines changed

.evergreen/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ functions:
7474
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
7575
7676
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
77-
export PATH="$MONGODB_BINARIES:$PATH"
77+
export PATH="$MONGODB_BINARIES:/home/admin/.cargo/bin:$PATH"
7878
export PROJECT="${project}"
7979
EOT
8080
# See what we've done

.evergreen/run-atlas-tests.sh

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

.evergreen/run-ocsp-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ fi
2020
createvirtualenv $PYTHON ocsptest
2121
trap "deactivate; rm -rf ocsptest" EXIT HUP
2222

23-
python -m pip install --prefer-binary pyopenssl requests service_identity
23+
python -m pip install --prefer-binary -r .evergreen/test-pyopenssl-requirements.txt
2424

2525
OCSP_TLS_SHOULD_SUCCEED=${OCSP_TLS_SHOULD_SUCCEED} CA_FILE=${CA_FILE} python test/ocsp/test_ocsp.py

.evergreen/run-tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [ -z "$PYTHON_BINARY" ]; then
7575
exit 1
7676
fi
7777
else
78-
$VIRTUALENV pymongotestvenv
78+
$VIRTUALENV --never-download pymongotestvenv
7979
. pymongotestvenv/bin/activate
8080
PYTHON=python
8181
trap "deactivate; rm -rf pymongotestvenv" EXIT HUP
@@ -114,7 +114,7 @@ if [ -n "$TEST_PYOPENSSL" ]; then
114114
trap "deactivate; rm -rf pyopenssltest" EXIT HUP
115115
PYTHON=python
116116

117-
python -m pip install --prefer-binary pyopenssl requests service_identity
117+
python -m pip install --prefer-binary -r .evergreen/test-pyopenssl-requirements.txt
118118
fi
119119

120120
if [ -n "$TEST_ENCRYPTION" ]; then
+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# cffi==1.14.3 was the last installable release on RHEL 6.2 with Python 3.4
22
cffi==1.14.3;python_version=="3.4"
33
cffi>=1.12.0,<2;python_version!="3.4"
4-
cryptography>=2
4+
cryptography>=2,<3.4;python_version=="2.7"
5+
cryptography>=2,<2.9;python_version=="3.4"
6+
cryptography>=2,<3.3;python_version=="3.5"
7+
cryptography>=2;python_version>"3.5"
58
# boto3 is required by drivers-evergreen-tools/.evergreen/csfle/set-temp-creds.sh
69
boto3<2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-r test-encryption-requirements.txt
2+
pyopenssl>=17.2.0,<20;python_version=="3.4"
3+
pyopenssl>=17.2.0;python_version!="3.4"
4+
attrs<=20.3.0;python_version=="3.4"
5+
service-identity==18.1.0;python_version=="3.4"
6+
service-identity>=18.1.0;python_version!="3.4"
7+
requests<2.22;python_version=="3.4"
8+
requests<3.0;python_version!="3.4"

0 commit comments

Comments
 (0)