Merge branch 'master' into PYTHON-4847

Author: NoahStapp

.evergreen/config.yml

@@ -34,8 +34,8 @@ else # Set up virtualenv before installing hatch
     fi
     export HATCH_CONFIG
     hatch config restore
-    hatch config set dirs.data ".hatch/data"
-    hatch config set dirs.cache ".hatch/cache"
+    hatch config set dirs.data "$(pwd)/.hatch/data"
+    hatch config set dirs.cache "$(pwd)/.hatch/cache"
 
     run_hatch() {
       python -m hatch run "$@"

.evergreen/hatch.sh

@@ -30,7 +30,7 @@ set -o xtrace
 
 AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
-TEST_SUITES=""
+TEST_SUITES=${TEST_SUITES:-}
 TEST_ARGS="${*:1}"
 
 export PIP_QUIET=1  # Quiet by default

.evergreen/run-tests.sh

@@ -26,7 +26,17 @@
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.9", "pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS
+MIN_MAX_PYTHON = [CPYTHONS[0], CPYTHONS[-1]]
 BATCHTIME_WEEK = 10080
+AUTH_SSLS = [("auth", "ssl"), ("noauth", "ssl"), ("noauth", "nossl")]
+TOPOLOGIES = ["standalone", "replica_set", "sharded_cluster"]
+SYNCS = ["sync", "async"]
+DISPLAY_LOOKUP = dict(
+    ssl=dict(ssl="SSL", nossl="NoSSL"),
+    auth=dict(auth="Auth", noauth="NoAuth"),
+    test_suites=dict(default="Sync", default_async="Async"),
+    coverage=dict(coverage="cov"),
+)
 HOSTS = dict()
 
 
@@ -35,11 +45,18 @@ class Host:
     name: str
     run_on: str
     display_name: str
+    expansions: dict[str, str]
 
 
-HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8")
-HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64")
-HOSTS["macos"] = Host("macos", "macos-14", "macOS")
+_macos_expansions = dict(  # CSOT tests are unreliable on slow hosts.
+    SKIP_CSOT_TESTS="true"
+)
+
+HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8", dict())
+HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64", _macos_expansions)
+HOSTS["win32"] = Host("win32", "windows-64-vsMulti-small", "Win32", _macos_expansions)
+HOSTS["macos"] = Host("macos", "macos-14", "macOS", _macos_expansions)
+HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS Arm64", _macos_expansions)
 
 
 ##############
@@ -67,6 +84,7 @@ def create_variant(
         expansions["PYTHON_BINARY"] = get_python_binary(python, host)
     if version:
         expansions["VERSION"] = version
+    expansions.update(HOSTS[host].expansions)
     expansions = expansions or None
     return BuildVariant(
         name=name,
@@ -80,10 +98,8 @@ def create_variant(
 
 def get_python_binary(python: str, host: str) -> str:
     """Get the appropriate python binary given a python version and host."""
-    if host == "win64":
-        is_32 = python.startswith("32-bit")
-        if is_32:
-            _, python = python.split()
+    if host in ["win64", "win32"]:
+        if host == "win32":
             base = "C:/python/32"
         else:
             base = "C:/python"
@@ -93,19 +109,29 @@ def get_python_binary(python: str, host: str) -> str:
     if host == "rhel8":
         return f"/opt/python/{python}/bin/python3"
 
-    if host == "macos":
+    if host in ["macos", "macos-arm64"]:
         return f"/Library/Frameworks/Python.Framework/Versions/{python}/bin/python3"
 
     raise ValueError(f"no match found for python {python} on {host}")
 
 
-def get_display_name(base: str, host: str, version: str, python: str) -> str:
+def get_display_name(base: str, host: str, **kwargs) -> str:
     """Get the display name of a variant."""
-    if version not in ["rapid", "latest"]:
-        version = f"v{version}"
-    if not python.startswith("pypy"):
-        python = f"py{python}"
-    return f"{base} {HOSTS[host].display_name} {version} {python}"
+    display_name = f"{base} {HOSTS[host].display_name}"
+    for key, value in kwargs.items():
+        name = value
+        if key == "version":
+            if value not in ["rapid", "latest"]:
+                name = f"v{value}"
+        elif key == "python":
+            if not value.startswith("pypy"):
+                name = f"py{value}"
+        elif key.lower() in DISPLAY_LOOKUP:
+            name = DISPLAY_LOOKUP[key.lower()][value]
+        else:
+            raise ValueError(f"Missing display handling for {key}")
+        display_name = f"{display_name} {name}"
+    return display_name
 
 
 def zip_cycle(*iterables, empty_default=None):
@@ -115,6 +141,15 @@ def zip_cycle(*iterables, empty_default=None):
         yield tuple(next(i, empty_default) for i in cycles)
 
 
+def generate_yaml(tasks=None, variants=None):
+    """Generate the yaml for a given set of tasks and variants."""
+    project = EvgProject(tasks=tasks, buildvariants=variants)
+    out = ShrubService.generate_yaml(project)
+    # Dedent by two spaces to match what we use in config.yml
+    lines = [line[2:] for line in out.splitlines()]
+    print("\n".join(lines))  # noqa: T201
+
+
 ##############
 # Variants
 ##############
@@ -159,9 +194,63 @@ def create_ocsp_variants() -> list[BuildVariant]:
     return variants
 
 
+def create_server_variants() -> list[BuildVariant]:
+    variants = []
+
+    # Run the full matrix on linux with min and max CPython, and latest pypy.
+    host = "rhel8"
+    for python, (auth, ssl) in product([*MIN_MAX_PYTHON, PYPYS[-1]], AUTH_SSLS):
+        display_name = f"Test {host}"
+        expansions = dict(AUTH=auth, SSL=ssl, COVERAGE="coverage")
+        display_name = get_display_name("Test", host, python=python, **expansions)
+        variant = create_variant(
+            [f".{t}" for t in TOPOLOGIES],
+            display_name,
+            python=python,
+            host=host,
+            tags=["coverage_tag"],
+            expansions=expansions,
+        )
+        variants.append(variant)
+
+    # Test the rest of the pythons on linux.
+    for python, (auth, ssl), topology in zip_cycle(
+        CPYTHONS[1:-1] + PYPYS[:-1], AUTH_SSLS, TOPOLOGIES
+    ):
+        display_name = f"Test {host}"
+        expansions = dict(AUTH=auth, SSL=ssl)
+        display_name = get_display_name("Test", host, python=python, **expansions)
+        variant = create_variant(
+            [f".{topology}"],
+            display_name,
+            python=python,
+            host=host,
+            expansions=expansions,
+        )
+        variants.append(variant)
+
+    # Test a subset on each of the other platforms.
+    for host in ("macos", "macos-arm64", "win64", "win32"):
+        for (python, (auth, ssl), topology), sync in product(
+            zip_cycle(MIN_MAX_PYTHON, AUTH_SSLS, TOPOLOGIES), SYNCS
+        ):
+            test_suite = "default" if sync == "sync" else "default_async"
+            expansions = dict(AUTH=auth, SSL=ssl, TEST_SUITES=test_suite)
+            display_name = get_display_name("Test", host, python=python, **expansions)
+            variant = create_variant(
+                [f".{topology}"],
+                display_name,
+                python=python,
+                host=host,
+                expansions=expansions,
+            )
+            variants.append(variant)
+
+    return variants
+
+
 ##################
 # Generate Config
 ##################
 
-project = EvgProject(tasks=None, buildvariants=create_ocsp_variants())
-print(ShrubService.generate_yaml(project))  # noqa: T201
+generate_yaml(variants=create_server_variants())

.evergreen/scripts/generate_config.py

@@ -14,6 +14,9 @@ PyMongo 4.11 brings a number of changes including:
 - Dropped support for MongoDB 3.6.
 - Added support for free-threaded Python with the GIL disabled. For more information see:
   `Free-threaded CPython <https://docs.python.org/3.13/whatsnew/3.13.html#whatsnew313-free-threaded-cpython>`_.
+- :attr:`~pymongo.asynchronous.mongo_client.AsyncMongoClient.address` and
+  :attr:`~pymongo.mongo_client.MongoClient.address` now correctly block when called on unconnected clients
+  until either connection succeeds or a server selection timeout error is raised.
 
 Issues Resolved
 ...............

doc/changelog.rst

@@ -1453,13 +1453,6 @@ async def address(self) -> Optional[tuple[str, int]]:
                 'Cannot use "address" property when load balancing among'
                 ' mongoses, use "nodes" instead.'
             )
-        if topology_type not in (
-            TOPOLOGY_TYPE.ReplicaSetWithPrimary,
-            TOPOLOGY_TYPE.Single,
-            TOPOLOGY_TYPE.LoadBalanced,
-            TOPOLOGY_TYPE.Sharded,
-        ):
-            return None
         return await self._server_property("address")
 
     @property

pymongo/asynchronous/mongo_client.py

@@ -1447,13 +1447,6 @@ def address(self) -> Optional[tuple[str, int]]:
                 'Cannot use "address" property when load balancing among'
                 ' mongoses, use "nodes" instead.'
             )
-        if topology_type not in (
-            TOPOLOGY_TYPE.ReplicaSetWithPrimary,
-            TOPOLOGY_TYPE.Single,
-            TOPOLOGY_TYPE.LoadBalanced,
-            TOPOLOGY_TYPE.Sharded,
-        ):
-            return None
         return self._server_property("address")
 
     @property

pymongo/synchronous/mongo_client.py

@@ -838,8 +838,6 @@ async def test_init_disconnected(self):
         c = await self.async_rs_or_single_client(connect=False)
         self.assertIsInstance(c.topology_description, TopologyDescription)
         self.assertEqual(c.topology_description, c._topology._description)
-        self.assertIsNone(await c.address)  # PYTHON-2981
-        await c.admin.command("ping")  # connect
         if async_client_context.is_rs:
             # The primary's host and port are from the replica set config.
             self.assertIsNotNone(await c.address)

test/asynchronous/test_client.py

@@ -812,8 +812,6 @@ def test_init_disconnected(self):
         c = self.rs_or_single_client(connect=False)
         self.assertIsInstance(c.topology_description, TopologyDescription)
         self.assertEqual(c.topology_description, c._topology._description)
-        self.assertIsNone(c.address)  # PYTHON-2981
-        c.admin.command("ping")  # connect
         if client_context.is_rs:
             # The primary's host and port are from the replica set config.
             self.assertIsNotNone(c.address)

test/test_client.py

@@ -59,7 +59,8 @@ def test_client(self):
 
         with self.assertRaises(ServerSelectionTimeoutError):
             c.db.command("ping")
-        self.assertEqual(c.address, None)
+        with self.assertRaises(ServerSelectionTimeoutError):
+            _ = c.address
 
         # Client can still discover the primary node
         c.revive_host("a:1")