Skip to content

Commit d504322

Browse files
ShaneHarveyShaneHarvey
authored
PYTHON-3694 Test with MongoDB 7.0 (#1207)
1 parent 2752a7d commit d504322

File tree

3 files changed

+74
-27
lines changed

3 files changed

+74
-27
lines changed

‎.evergreen/config.yml

Lines changed: 72 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,6 +1448,7 @@ tasks:
14481448
VERSION: "5.0"
14491449
TOPOLOGY: "sharded_cluster"
14501450
- func: "run tests"
1451+
14511452
- name: "test-6.0-standalone"
14521453
tags: ["6.0", "standalone"]
14531454
commands:
@@ -1475,6 +1476,33 @@ tasks:
14751476
TOPOLOGY: "sharded_cluster"
14761477
- func: "run tests"
14771478

1479+
- name: "test-7.0-standalone"
1480+
tags: ["7.0", "standalone"]
1481+
commands:
1482+
- func: "bootstrap mongo-orchestration"
1483+
vars:
1484+
VERSION: "7.0"
1485+
TOPOLOGY: "server"
1486+
- func: "run tests"
1487+
1488+
- name: "test-7.0-replica_set"
1489+
tags: ["7.0", "replica_set"]
1490+
commands:
1491+
- func: "bootstrap mongo-orchestration"
1492+
vars:
1493+
VERSION: "7.0"
1494+
TOPOLOGY: "replica_set"
1495+
- func: "run tests"
1496+
1497+
- name: "test-7.0-sharded_cluster"
1498+
tags: ["7.0", "sharded_cluster"]
1499+
commands:
1500+
- func: "bootstrap mongo-orchestration"
1501+
vars:
1502+
VERSION: "7.0"
1503+
TOPOLOGY: "sharded_cluster"
1504+
- func: "run tests"
1505+
14781506
- name: "test-latest-standalone"
14791507
tags: ["latest", "standalone"]
14801508
commands:
@@ -1955,14 +1983,14 @@ tasks:
19551983
- func: "run aws auth test with aws web identity credentials"
19561984
- func: "run aws ECS auth test"
19571985

1958-
- name: "aws-auth-test-latest"
1986+
- name: "aws-auth-test-7.0"
19591987
commands:
19601988
- func: "bootstrap mongo-orchestration"
19611989
vars:
19621990
AUTH: "auth"
19631991
ORCHESTRATION_FILE: "auth-aws.json"
19641992
TOPOLOGY: "server"
1965-
VERSION: "latest"
1993+
VERSION: "7.0"
19661994
- func: "add aws auth variables to file"
19671995
- func: "run aws auth test with regular aws credentials"
19681996
- func: "run aws auth test with assume role credentials"
@@ -1971,6 +1999,7 @@ tasks:
19711999
- func: "run aws auth test with aws EC2 credentials"
19722000
- func: "run aws auth test with aws web identity credentials"
19732001
- func: "run aws ECS auth test"
2002+
19742003
- name: "aws-auth-test-rapid"
19752004
commands:
19762005
- func: "bootstrap mongo-orchestration"
@@ -1988,6 +2017,23 @@ tasks:
19882017
- func: "run aws auth test with aws web identity credentials"
19892018
- func: "run aws ECS auth test"
19902019

2020+
- name: "aws-auth-test-latest"
2021+
commands:
2022+
- func: "bootstrap mongo-orchestration"
2023+
vars:
2024+
AUTH: "auth"
2025+
ORCHESTRATION_FILE: "auth-aws.json"
2026+
TOPOLOGY: "server"
2027+
VERSION: "latest"
2028+
- func: "add aws auth variables to file"
2029+
- func: "run aws auth test with regular aws credentials"
2030+
- func: "run aws auth test with assume role credentials"
2031+
- func: "run aws auth test with aws credentials as environment variables"
2032+
- func: "run aws auth test with aws credentials and session token as environment variables"
2033+
- func: "run aws auth test with aws EC2 credentials"
2034+
- func: "run aws auth test with aws web identity credentials"
2035+
- func: "run aws ECS auth test"
2036+
19912037
- name: load-balancer-test
19922038
commands:
19932039
- func: "bootstrap mongo-orchestration"
@@ -2319,6 +2365,10 @@ axes:
23192365
display_name: "MongoDB 6.0"
23202366
variables:
23212367
VERSION: "6.0"
2368+
- id: "7.0"
2369+
display_name: "MongoDB 7.0"
2370+
variables:
2371+
VERSION: "7.0"
23222372
- id: "latest"
23232373
display_name: "MongoDB latest"
23242374
variables:
@@ -2568,21 +2618,6 @@ axes:
25682618
batchtime: 10080 # 7 days
25692619

25702620
buildvariants:
2571-
- matrix_name: "tests-all"
2572-
matrix_spec:
2573-
platform:
2574-
# OSes that support versions of MongoDB>=3.6 with SSL.
2575-
- rhel84
2576-
auth-ssl: "*"
2577-
display_name: "${platform} ${auth-ssl}"
2578-
tasks:
2579-
- ".6.0"
2580-
- ".5.0"
2581-
- ".4.4"
2582-
- ".4.2"
2583-
- ".4.0"
2584-
- ".3.6"
2585-
25862621
- matrix_name: "tests-archlinux"
25872622
matrix_spec:
25882623
platform:
@@ -2622,6 +2657,7 @@ buildvariants:
26222657
display_name: "${platform} ${auth} ${ssl}"
26232658
tasks:
26242659
- ".latest"
2660+
- ".7.0"
26252661
- ".6.0"
26262662
- ".5.0"
26272663
- ".4.4"
@@ -2637,6 +2673,7 @@ buildvariants:
26372673
display_name: "${platform} ${auth-ssl}"
26382674
tasks:
26392675
- ".latest"
2676+
- ".7.0"
26402677
- ".6.0"
26412678
- ".5.0"
26422679
- ".4.4"
@@ -2660,6 +2697,7 @@ buildvariants:
26602697
add_tasks: &encryption-server-versions
26612698
- ".rapid"
26622699
- ".latest"
2700+
- ".7.0"
26632701
- ".6.0"
26642702
- ".5.0"
26652703
- ".4.4"
@@ -2688,6 +2726,7 @@ buildvariants:
26882726
tasks: &all-server-versions
26892727
- ".rapid"
26902728
- ".latest"
2729+
- ".7.0"
26912730
- ".6.0"
26922731
- ".5.0"
26932732
- ".4.4"
@@ -2712,8 +2751,8 @@ buildvariants:
27122751
display_name: "PyOpenSSL ${platform} ${python-version} ${auth}"
27132752
tasks:
27142753
- '.replica_set'
2715-
# Test standalone and sharded only on 5.0 and later.
2716-
- '.5.0'
2754+
# Test standalone and sharded only on 7.0.
2755+
- '.7.0'
27172756

27182757
- matrix_name: "tests-pyopenssl-macOS"
27192758
matrix_spec:
@@ -2827,6 +2866,7 @@ buildvariants:
28272866
tasks:
28282867
- ".rapid"
28292868
- ".latest"
2869+
- ".7.0"
28302870
- ".6.0"
28312871
- ".5.0"
28322872
- ".4.4"
@@ -2889,6 +2929,8 @@ buildvariants:
28892929
then:
28902930
add_tasks:
28912931
- "test-latest-standalone"
2932+
- "test-7.0-standalone"
2933+
- "test-6.0-standalone"
28922934
- "test-5.0-standalone"
28932935
- "test-4.4-standalone"
28942936
- "test-4.2-standalone"
@@ -3028,7 +3070,7 @@ buildvariants:
30283070
matrix_spec:
30293071
platform: ubuntu-20.04
30303072
python-version: ["3.7", "3.10", "pypy3.7", "pypy3.8"]
3031-
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
3073+
mongodb-version: ["4.4", "5.0", "6.0", "7.0", "latest"]
30323074
auth: "noauth"
30333075
ssl: "ssl"
30343076
display_name: "OCSP test ${platform} ${python-version} ${mongodb-version}"
@@ -3040,7 +3082,7 @@ buildvariants:
30403082
matrix_spec:
30413083
platform: windows-64-vsMulti-small
30423084
python-version-windows: ["3.7", "3.10"]
3043-
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
3085+
mongodb-version: ["4.4", "5.0", "6.0", "7.0", "latest"]
30443086
auth: "noauth"
30453087
ssl: "ssl"
30463088
display_name: "OCSP test ${platform} ${python-version-windows} ${mongodb-version}"
@@ -3052,7 +3094,7 @@ buildvariants:
30523094
- matrix_name: "ocsp-test-macos"
30533095
matrix_spec:
30543096
platform: macos-1014
3055-
mongodb-version: ["4.4", "5.0", "6.0", "latest"]
3097+
mongodb-version: ["4.4", "5.0", "6.0", "7.0", "latest"]
30563098
auth: "noauth"
30573099
ssl: "ssl"
30583100
display_name: "OCSP test ${platform} ${mongodb-version}"
@@ -3069,9 +3111,10 @@ buildvariants:
30693111
tasks:
30703112
- name: "aws-auth-test-4.4"
30713113
- name: "aws-auth-test-5.0"
3072-
- name: "aws-auth-test-latest"
30733114
- name: "aws-auth-test-6.0"
3115+
- name: "aws-auth-test-7.0"
30743116
- name: "aws-auth-test-rapid"
3117+
- name: "aws-auth-test-latest"
30753118

30763119
- matrix_name: "aws-auth-test-mac"
30773120
matrix_spec:
@@ -3081,9 +3124,11 @@ buildvariants:
30813124
tasks:
30823125
- name: "aws-auth-test-4.4"
30833126
- name: "aws-auth-test-5.0"
3084-
- name: "aws-auth-test-latest"
30853127
- name: "aws-auth-test-6.0"
3128+
- name: "aws-auth-test-7.0"
30863129
- name: "aws-auth-test-rapid"
3130+
- name: "aws-auth-test-latest"
3131+
30873132
- matrix_name: "aws-auth-test-windows"
30883133
matrix_spec:
30893134
platform: [windows-64-vsMulti-small]
@@ -3092,14 +3137,15 @@ buildvariants:
30923137
tasks:
30933138
- name: "aws-auth-test-4.4"
30943139
- name: "aws-auth-test-5.0"
3095-
- name: "aws-auth-test-latest"
30963140
- name: "aws-auth-test-6.0"
3141+
- name: "aws-auth-test-7.0"
30973142
- name: "aws-auth-test-rapid"
3143+
- name: "aws-auth-test-latest"
30983144

30993145
- matrix_name: "load-balancer"
31003146
matrix_spec:
31013147
platform: rhel84
3102-
mongodb-version: ["rapid", "latest", "6.0"]
3148+
mongodb-version: ["6.0", "7.0", "rapid", "latest"]
31033149
auth-ssl: "*"
31043150
python-version: "*"
31053151
loadbalancer: "*"

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ is a `gridfs
1616
<https://github.com/mongodb/specifications/blob/master/source/gridfs/gridfs-spec.rst/>`_
1717
implementation on top of ``pymongo``.
1818

19-
PyMongo supports MongoDB 3.6, 4.0, 4.2, 4.4, 5.0, and 6.0.
19+
PyMongo supports MongoDB 3.6, 4.0, 4.2, 4.4, 5.0, 6.0, and 7.0.
2020

2121
Support / Feedback
2222
==================

‎doc/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Changelog
44
Changes in Version 4.4
55
-----------------------
66

7+
- Added support for MongoDB 7.0.
78
- Added support for passing a list containing (key, direction) pairs
89
or keys to :meth:`~pymongo.collection.Collection.create_index`.
910
- pymongocrypt 1.5.0 or later is now required for client side field level

0 commit comments

Comments
 (0)