Merge branch 'master' into PYTHON-2390

Author: NoahStapp

.evergreen/run-tests.sh

@@ -25,11 +25,7 @@ else
   exit 1
 fi
 
-# List the packages.
-uv sync ${UV_ARGS} --reinstall --quiet
-uv pip list
-
 # Start the test runner.
-uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
+uv run ${UV_ARGS} --reinstall .evergreen/scripts/run_tests.py "$@"
 
 popd

.evergreen/scripts/generate_config_utils.py

@@ -273,7 +273,7 @@ def generate_yaml(tasks=None, variants=None):
     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
+    print("\n".join(lines))
 
 
 ##################

.evergreen/scripts/resync-all-specs.py

@@ -11,7 +11,7 @@
 
 def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
     """Actually sync the specs"""
-    print("Beginning to sync specs")  # noqa: T201
+    print("Beginning to sync specs")
     for spec in os.scandir(directory):
         if not spec.is_dir():
             continue
@@ -27,11 +27,11 @@ def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
             )
         except CalledProcessError as exc:
             errored[spec.name] = exc.stderr
-    print("Done syncing specs")  # noqa: T201
+    print("Done syncing specs")
 
 
 def apply_patches():
-    print("Beginning to apply patches")  # noqa: T201
+    print("Beginning to apply patches")
     subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True)  # noqa: S603, S607
     subprocess.run(
         ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"],  # noqa: S607
@@ -95,7 +95,7 @@ def write_summary(errored: dict[str, str], new: list[str], filename: Optional[st
         pr_body += "\n"
     if pr_body != "":
         if filename is None:
-            print(f"\n{pr_body}")  # noqa: T201
+            print(f"\n{pr_body}")
         else:
             with open(filename, "w") as f:
                 # replacements made for proper json

.evergreen/scripts/run_tests.py

@@ -10,6 +10,12 @@
 from pathlib import Path
 from shutil import which
 
+try:
+    import importlib_metadata
+except ImportError:
+    from importlib import metadata as importlib_metadata
+
+
 import pytest
 from utils import DRIVERS_TOOLS, LOGGER, ROOT, run_command
 
@@ -23,6 +29,21 @@
 SUB_TEST_NAME = os.environ.get("SUB_TEST_NAME")
 
 
+def list_packages():
+    packages = dict()
+    for distribution in importlib_metadata.distributions():
+        packages[distribution.name] = distribution
+    print("Package             Version     URL")
+    print("------------------- ----------- ----------------------------------------------------")
+    for name in sorted(packages):
+        distribution = packages[name]
+        url = ""
+        if distribution.origin is not None:
+            url = distribution.origin.url
+        print(f"{name:20s}{distribution.version:12s}{url}")
+    print("------------------- ----------- ----------------------------------------------------\n")
+
+
 def handle_perf(start_time: datetime):
     end_time = datetime.now()
     elapsed_secs = (end_time - start_time).total_seconds()
@@ -121,6 +142,9 @@ def handle_aws_lambda() -> None:
 
 
 def run() -> None:
+    # List the installed packages.
+    list_packages()
+
     # Handle green framework first so they can patch modules.
     if GREEN_FRAMEWORK:
         handle_green_framework()

.evergreen/scripts/setup_tests.py

@@ -346,7 +346,9 @@ def handle_test_env() -> None:
             setup_libmongocrypt()
 
         # TODO: Test with 'pip install pymongocrypt'
-        UV_ARGS.append("--group pymongocrypt_source")
+        UV_ARGS.append(
+            "--with pymongocrypt@git+https://github.com/mongodb/libmongocrypt@master#subdirectory=bindings/python"
+        )
 
         # Use the nocrypto build to avoid dependency issues with older windows/python versions.
         BASE = ROOT / "libmongocrypt/nocrypto"

pymongo/asynchronous/collection.py

@@ -2144,18 +2144,18 @@ async def count_documents(
         if comment is not None:
             kwargs["comment"] = comment
         pipeline.append({"$group": {"_id": 1, "n": {"$sum": 1}}})
-        cmd = {"aggregate": self._name, "pipeline": pipeline, "cursor": {}}
         if "hint" in kwargs and not isinstance(kwargs["hint"], str):
             kwargs["hint"] = helpers_shared._index_document(kwargs["hint"])
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd.update(kwargs)
 
         async def _cmd(
             session: Optional[AsyncClientSession],
             _server: Server,
             conn: AsyncConnection,
             read_preference: Optional[_ServerMode],
         ) -> int:
+            cmd: dict[str, Any] = {"aggregate": self._name, "pipeline": pipeline, "cursor": {}}
+            cmd.update(kwargs)
             result = await self._aggregate_one_result(
                 conn, read_preference, cmd, collation, session
             )
@@ -3194,26 +3194,27 @@ async def distinct(
         """
         if not isinstance(key, str):
             raise TypeError(f"key must be an instance of str, not {type(key)}")
-        cmd = {"distinct": self._name, "key": key}
         if filter is not None:
             if "query" in kwargs:
                 raise ConfigurationError("can't pass both filter and query")
             kwargs["query"] = filter
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd.update(kwargs)
-        if comment is not None:
-            cmd["comment"] = comment
         if hint is not None:
             if not isinstance(hint, str):
                 hint = helpers_shared._index_document(hint)
-            cmd["hint"] = hint  # type: ignore[assignment]
 
         async def _cmd(
             session: Optional[AsyncClientSession],
             _server: Server,
             conn: AsyncConnection,
             read_preference: Optional[_ServerMode],
         ) -> list:  # type: ignore[type-arg]
+            cmd = {"distinct": self._name, "key": key}
+            cmd.update(kwargs)
+            if comment is not None:
+                cmd["comment"] = comment
+            if hint is not None:
+                cmd["hint"] = hint  # type: ignore[assignment]
             return (
                 await self._command(
                     conn,
@@ -3248,27 +3249,26 @@ async def _find_and_modify(
                 f"return_document must be ReturnDocument.BEFORE or ReturnDocument.AFTER, not {type(return_document)}"
             )
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd = {"findAndModify": self._name, "query": filter, "new": return_document}
-        if let is not None:
-            common.validate_is_mapping("let", let)
-            cmd["let"] = let
-        cmd.update(kwargs)
-        if projection is not None:
-            cmd["fields"] = helpers_shared._fields_list_to_dict(projection, "projection")
-        if sort is not None:
-            cmd["sort"] = helpers_shared._index_document(sort)
-        if upsert is not None:
-            validate_boolean("upsert", upsert)
-            cmd["upsert"] = upsert
         if hint is not None:
             if not isinstance(hint, str):
                 hint = helpers_shared._index_document(hint)
-
-        write_concern = self._write_concern_for_cmd(cmd, session)
+        write_concern = self._write_concern_for_cmd(kwargs, session)
 
         async def _find_and_modify_helper(
             session: Optional[AsyncClientSession], conn: AsyncConnection, retryable_write: bool
         ) -> Any:
+            cmd = {"findAndModify": self._name, "query": filter, "new": return_document}
+            if let is not None:
+                common.validate_is_mapping("let", let)
+                cmd["let"] = let
+            cmd.update(kwargs)
+            if projection is not None:
+                cmd["fields"] = helpers_shared._fields_list_to_dict(projection, "projection")
+            if sort is not None:
+                cmd["sort"] = helpers_shared._index_document(sort)
+            if upsert is not None:
+                validate_boolean("upsert", upsert)
+                cmd["upsert"] = upsert
             acknowledged = write_concern.acknowledged
             if array_filters is not None:
                 if not acknowledged:

pymongo/synchronous/collection.py

@@ -2143,18 +2143,18 @@ def count_documents(
         if comment is not None:
             kwargs["comment"] = comment
         pipeline.append({"$group": {"_id": 1, "n": {"$sum": 1}}})
-        cmd = {"aggregate": self._name, "pipeline": pipeline, "cursor": {}}
         if "hint" in kwargs and not isinstance(kwargs["hint"], str):
             kwargs["hint"] = helpers_shared._index_document(kwargs["hint"])
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd.update(kwargs)
 
         def _cmd(
             session: Optional[ClientSession],
             _server: Server,
             conn: Connection,
             read_preference: Optional[_ServerMode],
         ) -> int:
+            cmd: dict[str, Any] = {"aggregate": self._name, "pipeline": pipeline, "cursor": {}}
+            cmd.update(kwargs)
             result = self._aggregate_one_result(conn, read_preference, cmd, collation, session)
             if not result:
                 return 0
@@ -3187,26 +3187,27 @@ def distinct(
         """
         if not isinstance(key, str):
             raise TypeError(f"key must be an instance of str, not {type(key)}")
-        cmd = {"distinct": self._name, "key": key}
         if filter is not None:
             if "query" in kwargs:
                 raise ConfigurationError("can't pass both filter and query")
             kwargs["query"] = filter
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd.update(kwargs)
-        if comment is not None:
-            cmd["comment"] = comment
         if hint is not None:
             if not isinstance(hint, str):
                 hint = helpers_shared._index_document(hint)
-            cmd["hint"] = hint  # type: ignore[assignment]
 
         def _cmd(
             session: Optional[ClientSession],
             _server: Server,
             conn: Connection,
             read_preference: Optional[_ServerMode],
         ) -> list:  # type: ignore[type-arg]
+            cmd = {"distinct": self._name, "key": key}
+            cmd.update(kwargs)
+            if comment is not None:
+                cmd["comment"] = comment
+            if hint is not None:
+                cmd["hint"] = hint  # type: ignore[assignment]
             return (
                 self._command(
                     conn,
@@ -3241,27 +3242,26 @@ def _find_and_modify(
                 f"return_document must be ReturnDocument.BEFORE or ReturnDocument.AFTER, not {type(return_document)}"
             )
         collation = validate_collation_or_none(kwargs.pop("collation", None))
-        cmd = {"findAndModify": self._name, "query": filter, "new": return_document}
-        if let is not None:
-            common.validate_is_mapping("let", let)
-            cmd["let"] = let
-        cmd.update(kwargs)
-        if projection is not None:
-            cmd["fields"] = helpers_shared._fields_list_to_dict(projection, "projection")
-        if sort is not None:
-            cmd["sort"] = helpers_shared._index_document(sort)
-        if upsert is not None:
-            validate_boolean("upsert", upsert)
-            cmd["upsert"] = upsert
         if hint is not None:
             if not isinstance(hint, str):
                 hint = helpers_shared._index_document(hint)
-
-        write_concern = self._write_concern_for_cmd(cmd, session)
+        write_concern = self._write_concern_for_cmd(kwargs, session)
 
         def _find_and_modify_helper(
             session: Optional[ClientSession], conn: Connection, retryable_write: bool
         ) -> Any:
+            cmd = {"findAndModify": self._name, "query": filter, "new": return_document}
+            if let is not None:
+                common.validate_is_mapping("let", let)
+                cmd["let"] = let
+            cmd.update(kwargs)
+            if projection is not None:
+                cmd["fields"] = helpers_shared._fields_list_to_dict(projection, "projection")
+            if sort is not None:
+                cmd["sort"] = helpers_shared._index_document(sort)
+            if upsert is not None:
+                validate_boolean("upsert", upsert)
+                cmd["upsert"] = upsert
             acknowledged = write_concern.acknowledged
             if array_filters is not None:
                 if not acknowledged:

pyproject.toml

@@ -60,9 +60,6 @@ coverage = [
 mockupdb = [
     "mockupdb@git+https://github.com/mongodb-labs/mongo-mockup-db@master"
 ]
-pymongocrypt_source = [
-    "pymongocrypt@git+https://github.com/mongodb/libmongocrypt@master#subdirectory=bindings/python"
-]
 perf = ["simplejson"]
 typing = [
     "mypy==1.18.1",
@@ -238,6 +235,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|dummy.*)$"
 
 [tool.ruff.lint.per-file-ignores]
 "pymongo/__init__.py" = ["E402"]
+".evergreen/scripts/*.py" = ["T201"]
 "test/*.py" = ["PT", "E402", "PLW", "SIM", "E741", "PTH", "S", "B904", "E722", "T201",
     "RET", "ARG", "F405", "B028", "PGH001", "B018", "F403", "RUF015", "E731", "B007",
     "UP031", "F401", "B023", "F811"]

requirements/test.txt

@@ -1,2 +1,3 @@
 pytest>=8.2
 pytest-asyncio>=0.24.0
+importlib_metadata>=7.0;python_version < "3.13"