Skip to content

Commit 1370dee

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents bd33b8d + 61e9047 commit 1370dee

File tree

12 files changed

+36
-8
lines changed

12 files changed

+36
-8
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,55 +535,71 @@ buildvariants:
535535
display_name: "* MongoDB v4.2"
536536
run_on:
537537
- rhel87-small
538+
expansions:
539+
VERSION: "4.2"
538540
tags: [coverage_tag]
539541
- name: mongodb-v4.4
540542
tasks:
541543
- name: .server-version
542544
display_name: "* MongoDB v4.4"
543545
run_on:
544546
- rhel87-small
547+
expansions:
548+
VERSION: "4.4"
545549
tags: [coverage_tag]
546550
- name: mongodb-v5.0
547551
tasks:
548552
- name: .server-version
549553
display_name: "* MongoDB v5.0"
550554
run_on:
551555
- rhel87-small
556+
expansions:
557+
VERSION: "5.0"
552558
tags: [coverage_tag]
553559
- name: mongodb-v6.0
554560
tasks:
555561
- name: .server-version
556562
display_name: "* MongoDB v6.0"
557563
run_on:
558564
- rhel87-small
565+
expansions:
566+
VERSION: "6.0"
559567
tags: [coverage_tag]
560568
- name: mongodb-v7.0
561569
tasks:
562570
- name: .server-version
563571
display_name: "* MongoDB v7.0"
564572
run_on:
565573
- rhel87-small
574+
expansions:
575+
VERSION: "7.0"
566576
tags: [coverage_tag]
567577
- name: mongodb-v8.0
568578
tasks:
569579
- name: .server-version
570580
display_name: "* MongoDB v8.0"
571581
run_on:
572582
- rhel87-small
583+
expansions:
584+
VERSION: "8.0"
573585
tags: [coverage_tag]
574586
- name: mongodb-rapid
575587
tasks:
576588
- name: .server-version
577589
display_name: "* MongoDB rapid"
578590
run_on:
579591
- rhel87-small
592+
expansions:
593+
VERSION: rapid
580594
tags: [coverage_tag]
581595
- name: mongodb-latest
582596
tasks:
583597
- name: .server-version
584598
display_name: "* MongoDB latest"
585599
run_on:
586600
- rhel87-small
601+
expansions:
602+
VERSION: latest
587603
tags: [coverage_tag]
588604

589605
# Stable api tests

.evergreen/scripts/generate_config.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ def create_server_version_variants() -> list[BuildVariant]:
7474
for version in ALL_VERSIONS:
7575
display_name = get_variant_name("* MongoDB", version=version)
7676
variant = create_variant(
77-
[".server-version"], display_name, host=DEFAULT_HOST, tags=["coverage_tag"]
77+
[".server-version"],
78+
display_name,
79+
version=version,
80+
host=DEFAULT_HOST,
81+
tags=["coverage_tag"],
7882
)
7983
variants.append(variant)
8084
return variants

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
49+
uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
5050
with:
5151
languages: ${{ matrix.language }}
5252
build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
6363
pip install -e .
6464
6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
66+
uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
6767
with:
6868
category: "/language:${{matrix.language}}"

.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
name: Download Wheels
143143
steps:
144144
- name: Download all workflow run artifacts
145-
uses: actions/download-artifact@v4
145+
uses: actions/download-artifact@v5
146146
- name: Flatten directory
147147
working-directory: .
148148
run: |

.github/workflows/release-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
id-token: write
7777
steps:
7878
- name: Download all the dists
79-
uses: actions/download-artifact@v4
79+
uses: actions/download-artifact@v5
8080
with:
8181
name: all-dist-${{ github.run_id }}
8282
path: dist/

.github/workflows/test-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
timeout-minutes: 20
196196
steps:
197197
- name: Download sdist
198-
uses: actions/download-artifact@v4
198+
uses: actions/download-artifact@v5
199199
- name: Unpack SDist
200200
shell: bash
201201
run: |

.github/workflows/zizmor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
with:
1919
persist-credentials: false
2020
- name: Run zizmor 🌈
21-
uses: zizmorcore/zizmor-action@383d31df2eb66a2f42db98c9654bdc73231f3e3a
21+
uses: zizmorcore/zizmor-action@c17832b972c15fd5f3d5065a7e16ad761a0a10d2

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ gevent = ["gevent", "cffi>=2.0.0b1;python_version=='3.14'"]
5555
eventlet = ["eventlet"]
5656
coverage = [
5757
"pytest-cov",
58-
"coverage>=5,<=7.10.2"
58+
"coverage>=5,<=7.10.3"
5959
]
6060
mockupdb = [
6161
"mockupdb@git+https://github.com/mongodb-labs/mongo-mockup-db@master"

test/asynchronous/test_collection.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@ async def test_create_index(self):
335335
await db.test.create_index(["hello", ("world", DESCENDING)])
336336
await db.test.create_index({"hello": 1}.items()) # type:ignore[arg-type]
337337

338+
# TODO: PYTHON-5491 - remove version max
339+
@async_client_context.require_version_max(8, 0, -1)
338340
async def test_drop_index(self):
339341
db = self.db
340342
await db.test.drop_indexes()

test/asynchronous/unified_format.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,8 @@ def maybe_skip_test(self, spec):
564564
self.skipTest("CSOT not implemented for watch()")
565565
if "cursors" in class_name:
566566
self.skipTest("CSOT not implemented for cursors")
567+
if "dropindex on collection" in description:
568+
self.skipTest("PYTHON-5491")
567569
if (
568570
"tailable" in class_name
569571
or "tailable" in description

0 commit comments

Comments
 (0)