Skip to content

Commit 011969a

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents c0d5220 + 5177e4e commit 011969a

File tree

5 files changed

+262
-172
lines changed

5 files changed

+262
-172
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -290,63 +290,3 @@ post:
290290
- func: "upload mo artifacts"
291291
- func: "upload test results"
292292
- func: "cleanup"
293-
294-
tasks:
295-
# Wildcard task. Do you need to find out what tools are available and where?
296-
# Throw it here, and execute this task on all buildvariants
297-
- name: getdata
298-
commands:
299-
- command: subprocess.exec
300-
binary: bash
301-
type: test
302-
params:
303-
args:
304-
- src/.evergreen/scripts/run-getdata.sh
305-
306-
- name: "coverage-report"
307-
tags: ["coverage"]
308-
depends_on:
309-
# BUILD-3165: We can't use "*" (all tasks) and specify "variant".
310-
# Instead list out all coverage tasks using tags.
311-
- name: ".standalone"
312-
variant: ".coverage_tag"
313-
# Run the coverage task even if some tasks fail.
314-
status: "*"
315-
# Run the coverage task even if some tasks are not scheduled in a patch build.
316-
patch_optional: true
317-
- name: ".replica_set"
318-
variant: ".coverage_tag"
319-
status: "*"
320-
patch_optional: true
321-
- name: ".sharded_cluster"
322-
variant: ".coverage_tag"
323-
status: "*"
324-
patch_optional: true
325-
commands:
326-
- func: "download and merge coverage"
327-
328-
- name: "check-import-time"
329-
tags: ["pr"]
330-
commands:
331-
- command: subprocess.exec
332-
type: test
333-
params:
334-
binary: bash
335-
working_dir: src
336-
include_expansions_in_env: ["PYTHON_BINARY"]
337-
args:
338-
- .evergreen/scripts/check-import-time.sh
339-
- ${revision}
340-
- ${github_commit}
341-
- name: "backport-pr"
342-
allowed_requesters: ["commit"]
343-
commands:
344-
- command: subprocess.exec
345-
type: test
346-
params:
347-
binary: bash
348-
args:
349-
- ${DRIVERS_TOOLS}/.evergreen/github_app/backport-pr.sh
350-
- mongodb
351-
- mongo-python-driver
352-
- ${github_commit}

.evergreen/generated_configs/tasks.yml

Lines changed: 149 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ tasks:
99
tags: [atlas_connect]
1010

1111
# Atlas data lake tests
12-
- name: test-atlas-data-lake-with_ext
12+
- name: test-atlas-data-lake-without_ext
1313
commands:
1414
- func: run tests
1515
vars:
1616
TEST_NAME: data_lake
1717
NO_EXT: "1"
1818
tags: [atlas_data_lake]
19-
- name: test-atlas-data-lake-without_ext
19+
- name: test-atlas-data-lake-with_ext
2020
commands:
2121
- func: run tests
2222
vars:
@@ -713,6 +713,128 @@ tasks:
713713
AWS_ROLE_SESSION_NAME: test
714714
tags: [auth-aws, auth-aws-web-identity]
715715

716+
# Backport pr tests
717+
- name: backport-pr
718+
commands:
719+
- command: subprocess.exec
720+
params:
721+
binary: bash
722+
args:
723+
- ${DRIVERS_TOOLS}/.evergreen/github_app/backport-pr.sh
724+
- mongodb
725+
- mongo-python-driver
726+
- ${github_commit}
727+
working_dir: src
728+
type: test
729+
730+
# Compression tests
731+
- name: test-compression-v4.0-python3.9
732+
commands:
733+
- func: run server
734+
vars:
735+
VERSION: "4.0"
736+
- func: run tests
737+
tags: [compression, "4.0"]
738+
- name: test-compression-v4.2-python3.9
739+
commands:
740+
- func: run server
741+
vars:
742+
VERSION: "4.2"
743+
- func: run tests
744+
tags: [compression, "4.2"]
745+
- name: test-compression-v4.4-python3.9
746+
commands:
747+
- func: run server
748+
vars:
749+
VERSION: "4.4"
750+
- func: run tests
751+
tags: [compression, "4.4"]
752+
- name: test-compression-v5.0-python3.9
753+
commands:
754+
- func: run server
755+
vars:
756+
VERSION: "5.0"
757+
- func: run tests
758+
tags: [compression, "5.0"]
759+
- name: test-compression-v6.0-python3.9
760+
commands:
761+
- func: run server
762+
vars:
763+
VERSION: "6.0"
764+
- func: run tests
765+
tags: [compression, "6.0"]
766+
- name: test-compression-v7.0-python3.9
767+
commands:
768+
- func: run server
769+
vars:
770+
VERSION: "7.0"
771+
- func: run tests
772+
tags: [compression, "7.0"]
773+
- name: test-compression-v8.0-python3.9
774+
commands:
775+
- func: run server
776+
vars:
777+
VERSION: "8.0"
778+
- func: run tests
779+
tags: [compression, "8.0"]
780+
- name: test-compression-rapid-python3.9
781+
commands:
782+
- func: run server
783+
vars:
784+
VERSION: rapid
785+
- func: run tests
786+
tags: [compression, rapid]
787+
- name: test-compression-latest-python3.9
788+
commands:
789+
- func: run server
790+
vars:
791+
VERSION: latest
792+
- func: run tests
793+
tags: [compression, latest]
794+
- name: test-compression-latest-python3.13-no-c
795+
commands:
796+
- func: run server
797+
vars:
798+
VERSION: latest
799+
- func: run tests
800+
vars:
801+
NO_EXT: "1"
802+
tags: [compression, latest]
803+
- name: test-compression-latest-python3.13
804+
commands:
805+
- func: run server
806+
vars:
807+
VERSION: latest
808+
- func: run tests
809+
vars: {}
810+
tags: [compression, latest]
811+
- name: test-compression-latest-pypy3.10
812+
commands:
813+
- func: run server
814+
vars:
815+
VERSION: latest
816+
- func: run tests
817+
tags: [compression, latest]
818+
819+
# Coverage report tests
820+
- name: coverage-report
821+
commands:
822+
- func: download and merge coverage
823+
depends_on:
824+
- name: .standalone
825+
variant: .coverage_tag
826+
status: "*"
827+
patch_optional: true
828+
- name: .replica_set
829+
variant: .coverage_tag
830+
status: "*"
831+
patch_optional: true
832+
- name: .sharded_cluster
833+
variant: .coverage_tag
834+
status: "*"
835+
patch_optional: true
836+
tags: [coverage]
837+
716838
# Doctest tests
717839
- name: test-doctests
718840
commands:
@@ -776,6 +898,31 @@ tasks:
776898
- func: run tests
777899
tags: [free-threading]
778900

901+
# Getdata tests
902+
- name: getdata
903+
commands:
904+
- command: subprocess.exec
905+
params:
906+
binary: bash
907+
args:
908+
- .evergreen/scripts/run-getdata.sh
909+
working_dir: src
910+
type: test
911+
912+
# Import time tests
913+
- name: check-import-time
914+
commands:
915+
- command: subprocess.exec
916+
params:
917+
binary: bash
918+
args:
919+
- .evergreen/scripts/check-import-time.sh
920+
- ${revision}
921+
- ${github_commit}
922+
working_dir: src
923+
type: test
924+
tags: [pr]
925+
779926
# Kms tests
780927
- name: test-gcpkms
781928
commands:

.evergreen/generated_configs/variants.yml

Lines changed: 12 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -160,90 +160,30 @@ buildvariants:
160160
- rhel87-small
161161

162162
# Compression tests
163-
- name: compression-snappy-rhel8-python3.9-no-c
163+
- name: compression-snappy-rhel8
164164
tasks:
165-
- name: .standalone .noauth .nossl .sync_async
166-
display_name: Compression snappy RHEL8 Python3.9 No C
167-
run_on:
168-
- rhel87-small
169-
expansions:
170-
COMPRESSORS: snappy
171-
NO_EXT: "1"
172-
PYTHON_BINARY: /opt/python/3.9/bin/python3
173-
- name: compression-snappy-rhel8-python3.10
174-
tasks:
175-
- name: .standalone .noauth .nossl .sync_async
176-
display_name: Compression snappy RHEL8 Python3.10
177-
run_on:
178-
- rhel87-small
179-
expansions:
180-
COMPRESSORS: snappy
181-
PYTHON_BINARY: /opt/python/3.10/bin/python3
182-
- name: compression-zlib-rhel8-python3.11-no-c
183-
tasks:
184-
- name: .standalone .noauth .nossl .sync_async
185-
display_name: Compression zlib RHEL8 Python3.11 No C
186-
run_on:
187-
- rhel87-small
188-
expansions:
189-
COMPRESSORS: zlib
190-
NO_EXT: "1"
191-
PYTHON_BINARY: /opt/python/3.11/bin/python3
192-
- name: compression-zlib-rhel8-python3.12
193-
tasks:
194-
- name: .standalone .noauth .nossl .sync_async
195-
display_name: Compression zlib RHEL8 Python3.12
165+
- name: .compression
166+
display_name: Compression snappy RHEL8
196167
run_on:
197168
- rhel87-small
198169
expansions:
199-
COMPRESSORS: zlib
200-
PYTHON_BINARY: /opt/python/3.12/bin/python3
201-
- name: compression-zstd-rhel8-python3.13-no-c
170+
COMPRESSOR: snappy
171+
- name: compression-zlib-rhel8
202172
tasks:
203-
- name: .standalone .noauth .nossl .sync_async !.4.0
204-
display_name: Compression zstd RHEL8 Python3.13 No C
173+
- name: .compression
174+
display_name: Compression zlib RHEL8
205175
run_on:
206176
- rhel87-small
207177
expansions:
208-
COMPRESSORS: zstd
209-
NO_EXT: "1"
210-
PYTHON_BINARY: /opt/python/3.13/bin/python3
211-
- name: compression-zstd-rhel8-python3.9
178+
COMPRESSOR: zlib
179+
- name: compression-zstd-rhel8
212180
tasks:
213-
- name: .standalone .noauth .nossl .sync_async !.4.0
214-
display_name: Compression zstd RHEL8 Python3.9
181+
- name: .compression !.4.0
182+
display_name: Compression zstd RHEL8
215183
run_on:
216184
- rhel87-small
217185
expansions:
218-
COMPRESSORS: zstd
219-
PYTHON_BINARY: /opt/python/3.9/bin/python3
220-
- name: compression-snappy-rhel8-pypy3.10
221-
tasks:
222-
- name: .standalone .noauth .nossl .sync_async
223-
display_name: Compression snappy RHEL8 PyPy3.10
224-
run_on:
225-
- rhel87-small
226-
expansions:
227-
COMPRESSORS: snappy
228-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
229-
- name: compression-zlib-rhel8-pypy3.10
230-
tasks:
231-
- name: .standalone .noauth .nossl .sync_async
232-
display_name: Compression zlib RHEL8 PyPy3.10
233-
run_on:
234-
- rhel87-small
235-
expansions:
236-
COMPRESSORS: zlib
237-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
238-
- name: compression-zstd-rhel8-pypy3.10
239-
tasks:
240-
- name: .standalone .noauth .nossl .sync_async !.4.0
241-
display_name: Compression zstd RHEL8 PyPy3.10
242-
run_on:
243-
- rhel87-small
244-
expansions:
245-
COMPRESSORS: zstd
246-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
186+
COMPRESSOR: zstd
247187

248188
# Coverage report tests
249189
- name: coverage-report

0 commit comments

Comments
 (0)