Skip to content

Commit 9babce9

Browse files
blink1073blink1073
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents 89984e1 + cfe7784 commit 9babce9

40 files changed

+2381
-358
lines changed

‎.evergreen/generated_configs/variants.yml‎

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,15 @@ buildvariants:
256256
expansions:
257257
COMPRESSORS: zstd
258258
PYTHON_BINARY: /opt/python/3.9/bin/python3
259-
- name: compression-snappy-rhel8-pypy3.9
259+
- name: compression-snappy-rhel8-pypy3.10
260260
tasks:
261261
- name: .standalone .noauth .nossl .sync_async
262-
display_name: Compression snappy RHEL8 PyPy3.9
262+
display_name: Compression snappy RHEL8 PyPy3.10
263263
run_on:
264264
- rhel87-small
265265
expansions:
266266
COMPRESSORS: snappy
267-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
267+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
268268
- name: compression-zlib-rhel8-pypy3.10
269269
tasks:
270270
- name: .standalone .noauth .nossl .sync_async
@@ -274,15 +274,15 @@ buildvariants:
274274
expansions:
275275
COMPRESSORS: zlib
276276
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
277-
- name: compression-zstd-rhel8-pypy3.9
277+
- name: compression-zstd-rhel8-pypy3.10
278278
tasks:
279279
- name: .standalone .noauth .nossl .sync_async !.4.0
280-
display_name: Compression zstd RHEL8 PyPy3.9
280+
display_name: Compression zstd RHEL8 PyPy3.10
281281
run_on:
282282
- rhel87-small
283283
expansions:
284284
COMPRESSORS: zstd
285-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
285+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
286286

287287
# Disable test commands tests
288288
- name: disable-test-commands-rhel8-python3.9
@@ -460,15 +460,6 @@ buildvariants:
460460
test_encryption: "true"
461461
test_encryption_pyopenssl: "true"
462462
PYTHON_BINARY: /opt/python/3.12/bin/python3
463-
- name: encryption-rhel8-pypy3.9
464-
tasks:
465-
- name: .sharded_cluster .auth .ssl .sync_async
466-
display_name: Encryption RHEL8 PyPy3.9
467-
run_on:
468-
- rhel87-small
469-
expansions:
470-
test_encryption: "true"
471-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
472463
- name: encryption-macos-python3.9
473464
tasks:
474465
- name: .latest .replica_set .sync_async
@@ -608,15 +599,6 @@ buildvariants:
608599
expansions:
609600
AUTH: auth
610601
PYTHON_BINARY: C:/python/Python313/python.exe
611-
- name: auth-enterprise-rhel8-pypy3.9-auth
612-
tasks:
613-
- name: test-enterprise-auth
614-
display_name: Auth Enterprise RHEL8 PyPy3.9 Auth
615-
run_on:
616-
- rhel87-small
617-
expansions:
618-
AUTH: auth
619-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
620602
- name: auth-enterprise-rhel8-pypy3.10-auth
621603
tasks:
622604
- name: test-enterprise-auth
@@ -900,10 +882,10 @@ buildvariants:
900882
TOPOLOGY: server
901883
VERSION: "8.0"
902884
PYTHON_BINARY: /opt/python/3.13/bin/python3
903-
- name: ocsp-rhel8-rapid-pypy3.9
885+
- name: ocsp-rhel8-rapid-pypy3.10
904886
tasks:
905887
- name: .ocsp
906-
display_name: OCSP RHEL8 rapid PyPy3.9
888+
display_name: OCSP RHEL8 rapid PyPy3.10
907889
run_on:
908890
- rhel87-small
909891
batchtime: 20160
@@ -912,11 +894,11 @@ buildvariants:
912894
SSL: ssl
913895
TOPOLOGY: server
914896
VERSION: rapid
915-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
916-
- name: ocsp-rhel8-latest-pypy3.10
897+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
898+
- name: ocsp-rhel8-latest-python3.9
917899
tasks:
918900
- name: .ocsp
919-
display_name: OCSP RHEL8 latest PyPy3.10
901+
display_name: OCSP RHEL8 latest Python3.9
920902
run_on:
921903
- rhel87-small
922904
batchtime: 20160
@@ -925,7 +907,7 @@ buildvariants:
925907
SSL: ssl
926908
TOPOLOGY: server
927909
VERSION: latest
928-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
910+
PYTHON_BINARY: /opt/python/3.9/bin/python3
929911
- name: ocsp-win64-v4.4-python3.9
930912
tasks:
931913
- name: .ocsp-rsa !.ocsp-staple
@@ -1061,17 +1043,6 @@ buildvariants:
10611043
expansions:
10621044
test_pyopenssl: "true"
10631045
PYTHON_BINARY: C:/python/Python313/python.exe
1064-
- name: pyopenssl-rhel8-pypy3.9
1065-
tasks:
1066-
- name: .replica_set .auth .ssl .sync_async
1067-
- name: .7.0 .auth .ssl .sync_async
1068-
display_name: PyOpenSSL RHEL8 PyPy3.9
1069-
run_on:
1070-
- rhel87-small
1071-
batchtime: 10080
1072-
expansions:
1073-
test_pyopenssl: "true"
1074-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
10751046
- name: pyopenssl-rhel8-pypy3.10
10761047
tasks:
10771048
- name: .replica_set .auth .ssl .sync_async
@@ -1164,17 +1135,6 @@ buildvariants:
11641135
expansions:
11651136
COVERAGE: coverage
11661137
PYTHON_BINARY: /opt/python/3.12/bin/python3
1167-
- name: test-rhel8-pypy3.9
1168-
tasks:
1169-
- name: .sharded_cluster .auth .ssl .sync_async
1170-
- name: .replica_set .noauth .ssl .sync_async
1171-
- name: .standalone .noauth .nossl .sync_async
1172-
display_name: "* Test RHEL8 PyPy3.9"
1173-
run_on:
1174-
- rhel87-small
1175-
expansions:
1176-
COVERAGE: coverage
1177-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
11781138
- name: test-macos-python3.9
11791139
tasks:
11801140
- name: .sharded_cluster .auth .ssl !.sync_async

‎.evergreen/install-dependencies.sh‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.evergreen/run-azurekms-test.sh‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,22 @@ export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
88
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
99
export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian11/master/latest/libmongocrypt.tar.gz
1010
SKIP_SERVERS=1 bash $HERE/setup-encryption.sh
11-
tar czf /tmp/mongo-python-driver.tgz .
11+
# Set up the remote files to test.
12+
git add .
13+
git commit -m "add files" || true
14+
git archive -o /tmp/mongo-python-driver.tar HEAD
15+
tar -rf /tmp/mongo-python-driver.tar libmongocrypt
16+
gzip -f /tmp/mongo-python-driver.tar
1217
# shellcheck disable=SC2088
13-
AZUREKMS_SRC="/tmp/mongo-python-driver.tgz" AZUREKMS_DST="~/" \
18+
AZUREKMS_SRC="/tmp/mongo-python-driver.tar.gz" AZUREKMS_DST="~/" \
1419
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
1520
echo "Copying files ... end"
1621
echo "Untarring file ... begin"
17-
AZUREKMS_CMD="tar xf mongo-python-driver.tgz" \
22+
AZUREKMS_CMD="tar xf mongo-python-driver.tar.gz" \
1823
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
1924
echo "Untarring file ... end"
2025
echo "Running test ... begin"
21-
AZUREKMS_CMD="KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 ./.evergreen/just.sh test-eg" \
26+
AZUREKMS_CMD="KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 bash ./.evergreen/just.sh test-eg" \
2227
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
2328
echo "Running test ... end"
2429
bash $HERE/teardown-encryption.sh

‎.evergreen/run-gcpkms-test.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ export GCPKMS_ZONE=${GCPKMS_ZONE}
1010
export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
1111
export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian11/master/latest/libmongocrypt.tar.gz
1212
SKIP_SERVERS=1 bash $HERE/setup-encryption.sh
13-
tar czf /tmp/mongo-python-driver.tgz .
14-
GCPKMS_SRC=/tmp/mongo-python-driver.tgz GCPKMS_DST=$GCPKMS_INSTANCENAME: $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/copy-file.sh
13+
# Set up the remote files to test.
14+
git add .
15+
git commit -m "add files" || true
16+
git archive -o /tmp/mongo-python-driver.tar HEAD
17+
tar -rf /tmp/mongo-python-driver.tar libmongocrypt
18+
gzip -f /tmp/mongo-python-driver.tar
19+
GCPKMS_SRC=/tmp/mongo-python-driver.tar.gz GCPKMS_DST=$GCPKMS_INSTANCENAME: $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/copy-file.sh
1520
echo "Copying files ... end"
1621
echo "Untarring file ... begin"
17-
GCPKMS_CMD="tar xf mongo-python-driver.tgz" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
22+
GCPKMS_CMD="tar xf mongo-python-driver.tar.gz" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
1823
echo "Untarring file ... end"
1924
echo "Running test ... begin"
2025
GCPKMS_CMD="SUCCESS=true TEST_FLE_GCP_AUTO=1 ./.evergreen/just.sh test-eg" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh

0 commit comments

Comments
 (0)