Skip to content

Commit 47f5804

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents 0fbfba7 + 2149567 commit 47f5804

36 files changed

+1743
-916
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,12 +1257,12 @@ buildvariants:
12571257
# Stable api tests
12581258
- name: stable-api-require-v1-rhel8-python3.9-auth
12591259
tasks:
1260-
- name: .standalone .5.0 .noauth .nossl .sync_async
1261-
- name: .standalone .6.0 .noauth .nossl .sync_async
1262-
- name: .standalone .7.0 .noauth .nossl .sync_async
1263-
- name: .standalone .8.0 .noauth .nossl .sync_async
1264-
- name: .standalone .rapid .noauth .nossl .sync_async
1265-
- name: .standalone .latest .noauth .nossl .sync_async
1260+
- name: "!.replica_set .5.0 .noauth .nossl .sync_async"
1261+
- name: "!.replica_set .6.0 .noauth .nossl .sync_async"
1262+
- name: "!.replica_set .7.0 .noauth .nossl .sync_async"
1263+
- name: "!.replica_set .8.0 .noauth .nossl .sync_async"
1264+
- name: "!.replica_set .rapid .noauth .nossl .sync_async"
1265+
- name: "!.replica_set .latest .noauth .nossl .sync_async"
12661266
display_name: Stable API require v1 RHEL8 Python3.9 Auth
12671267
run_on:
12681268
- rhel87-small
@@ -1290,12 +1290,12 @@ buildvariants:
12901290
tags: [versionedApi_tag]
12911291
- name: stable-api-require-v1-rhel8-python3.13-auth
12921292
tasks:
1293-
- name: .standalone .5.0 .noauth .nossl .sync_async
1294-
- name: .standalone .6.0 .noauth .nossl .sync_async
1295-
- name: .standalone .7.0 .noauth .nossl .sync_async
1296-
- name: .standalone .8.0 .noauth .nossl .sync_async
1297-
- name: .standalone .rapid .noauth .nossl .sync_async
1298-
- name: .standalone .latest .noauth .nossl .sync_async
1293+
- name: "!.replica_set .5.0 .noauth .nossl .sync_async"
1294+
- name: "!.replica_set .6.0 .noauth .nossl .sync_async"
1295+
- name: "!.replica_set .7.0 .noauth .nossl .sync_async"
1296+
- name: "!.replica_set .8.0 .noauth .nossl .sync_async"
1297+
- name: "!.replica_set .rapid .noauth .nossl .sync_async"
1298+
- name: "!.replica_set .latest .noauth .nossl .sync_async"
12991299
display_name: Stable API require v1 RHEL8 Python3.13 Auth
13001300
run_on:
13011301
- rhel87-small

.evergreen/scripts/generate_config.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ def create_storage_engine_variants():
546546
def create_stable_api_variants():
547547
host = DEFAULT_HOST
548548
tags = ["versionedApi_tag"]
549-
tasks = [f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")]
550549
variants = []
551550
types = ["require v1", "accept v2"]
552551

@@ -560,11 +559,17 @@ def create_stable_api_variants():
560559
expansions["REQUIRE_API_VERSION"] = "1"
561560
# MONGODB_API_VERSION is the apiVersion to use in the test suite.
562561
expansions["MONGODB_API_VERSION"] = "1"
562+
tasks = [
563+
f"!.replica_set .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")
564+
]
563565
else:
564566
# Test against a cluster with acceptApiVersion2 but without
565567
# requireApiVersion, and don't automatically add apiVersion to
566568
# clients created in the test suite.
567569
expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
570+
tasks = [
571+
f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")
572+
]
568573
base_display_name = f"Stable API {test_type}"
569574
display_name = get_display_name(base_display_name, host, python=python, **expansions)
570575
variant = create_variant(

doc/changelog.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ PyMongo 4.12 brings a number of changes including:
99
- Support for configuring DEK cache lifetime via the ``key_expiration_ms`` argument to
1010
:class:`~pymongo.encryption_options.AutoEncryptionOpts`.
1111
- Support for $lookup in CSFLE and QE supported on MongoDB 8.1+.
12+
- AsyncMongoClient no longer performs DNS resolution for "mongodb+srv://" connection strings on creation.
13+
To avoid blocking the asyncio loop, the resolution is now deferred until the client is first connected.
1214
- Added index hinting support to the
1315
:meth:`~pymongo.asynchronous.collection.AsyncCollection.distinct` and
1416
:meth:`~pymongo.collection.Collection.distinct` commands.
17+
- Deprecated the ``hedge`` parameter for
18+
:class:`~pymongo.read_preferences.PrimaryPreferred`,
19+
:class:`~pymongo.read_preferences.Secondary`,
20+
:class:`~pymongo.read_preferences.SecondaryPreferred`,
21+
:class:`~pymongo.read_preferences.Nearest`. Support for ``hedge`` will be removed in PyMongo 5.0.
1522

1623
Issues Resolved
1724
...............

pymongo/asynchronous/encryption.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
from pymongo.results import BulkWriteResult, DeleteResult
8888
from pymongo.ssl_support import get_ssl_context
8989
from pymongo.typings import _DocumentType, _DocumentTypeArg
90-
from pymongo.uri_parser import parse_host
90+
from pymongo.uri_parser_shared import parse_host
9191
from pymongo.write_concern import WriteConcern
9292

9393
if TYPE_CHECKING:

0 commit comments

Comments
 (0)