Merge branch 'master' of github.com:mongodb/mongo-python-driver into PYTHON-4976

blink1073 · blink1073 · commit c19673f23aa0 · 2025-01-21T16:57:41.000-06:00
diff --git a/.evergreen/install-dependencies.sh b/.evergreen/install-dependencies.sh
diff --git a/.evergreen/run-azurekms-test.sh b/.evergreen/run-azurekms-test.sh
@@ -23,7 +23,7 @@ AZUREKMS_CMD="tar xf mongo-python-driver.tar.gz" \
     $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
 echo "Untarring file ... end"
 echo "Running test ... begin"
-AZUREKMS_CMD="pwd && ls && KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 bash ./.evergreen/just.sh test-eg" \
+AZUREKMS_CMD="KEY_NAME=\"$AZUREKMS_KEYNAME\" KEY_VAULT_ENDPOINT=\"$AZUREKMS_KEYVAULTENDPOINT\" SUCCESS=true TEST_FLE_AZURE_AUTO=1 bash ./.evergreen/just.sh test-eg" \
     $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
 echo "Running test ... end"
 bash $HERE/teardown-encryption.sh
diff --git a/.evergreen/scripts/install-dependencies.sh b/.evergreen/scripts/install-dependencies.sh
@@ -1,6 +1,52 @@
 #!/bin/bash
 
 set -eu
+<<<<<<< HEAD
 file="$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
 # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
 [ -f "$file" ] && bash "$file"
+||||||| 86084adb2
+file="$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
+# Don't use ${file} syntax here because evergreen treats it as an empty expansion.
+[ -f "$file" ] && bash "$file" || echo "$file not available, skipping"
+=======
+
+# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
+if [ "${CI:-}" == "true" ]; then
+  _BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
+else
+  _BIN_DIR=$HOME/.local/bin
+fi
+
+
+# Helper function to pip install a dependency using a temporary python env.
+function _pip_install() {
+  _HERE=$(dirname ${BASH_SOURCE:-$0})
+  . $_HERE/../utils.sh
+  _VENV_PATH=$(mktemp -d)
+  echo "Installing $2 using pip..."
+  createvirtualenv "$(find_python3)" $_VENV_PATH
+  python -m pip install $1
+  ln -s "$(which $2)" $_BIN_DIR/$2
+  echo "Installing $2 using pip... done."
+}
+
+
+# Ensure just is installed.
+if ! command -v just 2>/dev/null; then
+  # On most systems we can install directly.
+  _TARGET=""
+  if [ "Windows_NT" = "${OS:-}" ]; then
+    _TARGET="--target x86_64-pc-windows-msvc"
+  fi
+  echo "Installing just..."
+  mkdir -p "$_BIN_DIR" 2>/dev/null || true
+  curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
+    _pip_install rust-just just
+  }
+  if ! command -v just 2>/dev/null; then
+    export PATH="$PATH:$_BIN_DIR"
+  fi
+  echo "Installing just... done."
+fi
+>>>>>>> 2235b8354cef0acc0b41321fc103d14acf0ef92f
diff --git a/.evergreen/scripts/prepare-resources.sh b/.evergreen/scripts/prepare-resources.sh
@@ -11,10 +11,10 @@ echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" >$MONGO_ORCHESTRA
 
 popd
 
-# # Copy PyMongo's test certificates over driver-evergreen-tools'
+# Copy PyMongo's test certificates over driver-evergreen-tools'
 cp ${PROJECT_DIRECTORY}/test/certificates/* ${DRIVERS_TOOLS}/.evergreen/x509gen/
 
-# # Replace MongoOrchestration's client certificate.
+# Replace MongoOrchestration's client certificate.
 cp ${PROJECT_DIRECTORY}/test/certificates/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
 
 if [ -w /etc/hosts ]; then
diff --git a/.evergreen/scripts/setup-dev-env.sh b/.evergreen/scripts/setup-dev-env.sh
@@ -11,11 +11,10 @@ if [ -f $HERE/env.sh ]; then
 fi
 
 # Ensure dependencies are installed.
-. .evergreen/install-dependencies.sh
+. $HERE/install-dependencies.sh
 
-# Ensure that we have the correct base python binary.
-echo "Setting up python environment..."
-if [ -z "${UV_PYTHON:-}" ]; then
+# Ensure there is a python venv.
+if [ ! -d $BIN_DIR ]; then
   . .evergreen/utils.sh
 
   if [ -z "${PYTHON_BINARY:-}" ]; then
diff --git a/bson/binary.py b/bson/binary.py
@@ -405,14 +405,17 @@ def from_vector(cls: Type[Binary], vector: BinaryVector) -> Binary:
     @classmethod
     @overload
     def from_vector(
-        cls: Type[Binary], vector: list[int, float], dtype: BinaryVectorDtype, padding: int = 0
+        cls: Type[Binary],
+        vector: Union[list[int], list[float]],
+        dtype: BinaryVectorDtype,
+        padding: int = 0,
     ) -> Binary:
         ...
 
     @classmethod
     def from_vector(
         cls: Type[Binary],
-        vector: Union[BinaryVector, list[int, float]],
+        vector: Union[BinaryVector, list[int], list[float]],
         dtype: Optional[BinaryVectorDtype] = None,
         padding: Optional[int] = None,
     ) -> Binary:
diff --git a/requirements/typing.txt b/requirements/typing.txt
@@ -1,5 +1,5 @@
 mypy==1.14.1
-pyright==1.1.391
+pyright==1.1.392.post0
 typing_extensions
 -r ./encryption.txt
 -r ./ocsp.txt
diff --git a/test/asynchronous/test_client.py b/test/asynchronous/test_client.py
@@ -237,10 +237,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         client = self.client
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            msg = "'AsyncMongoClient' object is not iterable"
+        msg = "'AsyncMongoClient' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in client:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/asynchronous/test_collection.py b/test/asynchronous/test_collection.py
@@ -133,13 +133,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         coll = self.db.coll
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            if _IS_SYNC:
-                msg = "'Collection' object is not iterable"
-            else:
-                msg = "'AsyncCollection' object is not iterable"
+        msg = "'AsyncCollection' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in coll:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/asynchronous/test_database.py b/test/asynchronous/test_database.py
@@ -103,10 +103,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         db = self.client.pymongo_test
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            msg = "'AsyncDatabase' object is not iterable"
+        msg = "'AsyncDatabase' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in db:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/test_client.py b/test/test_client.py
@@ -234,10 +234,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         client = self.client
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            msg = "'MongoClient' object is not iterable"
+        msg = "'MongoClient' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in client:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/test_collection.py b/test/test_collection.py
@@ -133,13 +133,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         coll = self.db.coll
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            if _IS_SYNC:
-                msg = "'Collection' object is not iterable"
-            else:
-                msg = "'Collection' object is not iterable"
+        msg = "'Collection' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in coll:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/test_database.py b/test/test_database.py
@@ -102,10 +102,7 @@ def test_getattr(self):
 
     def test_iteration(self):
         db = self.client.pymongo_test
-        if "PyPy" in sys.version and sys.version_info < (3, 8, 15):
-            msg = "'NoneType' object is not callable"
-        else:
-            msg = "'Database' object is not iterable"
+        msg = "'Database' object is not iterable"
         # Iteration fails
         with self.assertRaisesRegex(TypeError, msg):
             for _ in db:  # type: ignore[misc] # error: "None" not callable  [misc]
diff --git a/test/test_errors.py b/test/test_errors.py
@@ -47,15 +47,9 @@ def test_operation_failure(self):
             self.assertIn("full error", traceback.format_exc())
 
     def _test_unicode_strs(self, exc):
-        if sys.implementation.name == "pypy" and sys.implementation.version < (7, 3, 7):
-            # PyPy used to display unicode in repr differently.
-            self.assertEqual(
-                "unicode \U0001f40d, full error: {'errmsg': 'unicode \\U0001f40d'}", str(exc)
-            )
-        else:
-            self.assertEqual(
-                "unicode \U0001f40d, full error: {'errmsg': 'unicode \U0001f40d'}", str(exc)
-            )
+        self.assertEqual(
+            "unicode \U0001f40d, full error: {'errmsg': 'unicode \U0001f40d'}", str(exc)
+        )
         try:
             raise exc
         except Exception:
diff --git a/test/test_typing.py b/test/test_typing.py
@@ -15,6 +15,7 @@
 """Test that each file in mypy_fails/ actually fails mypy, and test some
 sample client code that uses PyMongo typings.
 """
+
 from __future__ import annotations
 
 import os
@@ -37,7 +38,8 @@
 if TYPE_CHECKING:
     from typing_extensions import NotRequired, TypedDict
 
-    from bson import ObjectId
+    from bson import Binary, ObjectId
+    from bson.binary import BinaryVector, BinaryVectorDtype
 
     class Movie(TypedDict):
         name: str
@@ -591,5 +593,22 @@ def test_son_document_type(self) -> None:
         obj["a"] = 1
 
 
+class TestBSONFromVectorType(unittest.TestCase):
+    @only_type_check
+    def test_from_vector_binaryvector(self):
+        list_vector = BinaryVector([127, 7], BinaryVectorDtype.INT8)
+        Binary.from_vector(list_vector)
+
+    @only_type_check
+    def test_from_vector_list_int(self):
+        list_vector = [127, 7]
+        Binary.from_vector(list_vector, BinaryVectorDtype.INT8)
+
+    @only_type_check
+    def test_from_vector_list_float(self):
+        list_vector = [127.0, 7.0]
+        Binary.from_vector(list_vector, BinaryVectorDtype.INT8)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tools/synchro.py b/tools/synchro.py
@@ -149,6 +149,10 @@
 _gridfs_dest_base = "./gridfs/synchronous/"
 _test_dest_base = "./test/"
 
+if not Path.exists(Path(_pymongo_dest_base)):
+    Path.mkdir(Path(_pymongo_dest_base))
+if not Path.exists(Path(_gridfs_dest_base)):
+    Path.mkdir(Path(_gridfs_dest_base))
 
 async_files = [
     _pymongo_base + f for f in listdir(_pymongo_base) if (Path(_pymongo_base) / f).is_file()
@@ -170,18 +174,6 @@ def async_only_test(f: str) -> bool:
     if (Path(_test_base) / f).is_file() and not async_only_test(f)
 ]
 
-sync_files = [
-    _pymongo_dest_base + f
-    for f in listdir(_pymongo_dest_base)
-    if (Path(_pymongo_dest_base) / f).is_file()
-]
-
-sync_gridfs_files = [
-    _gridfs_dest_base + f
-    for f in listdir(_gridfs_dest_base)
-    if (Path(_gridfs_dest_base) / f).is_file()
-]
-
 # Add each asynchronized test here as part of the converting PR
 converted_tests = [
     "__init__.py",
@@ -223,15 +215,10 @@ def async_only_test(f: str) -> bool:
     "unified_format.py",
 ]
 
-sync_test_files = [
-    _test_dest_base + f for f in converted_tests if (Path(_test_dest_base) / f).is_file()
-]
-
-
-docstring_translate_files = sync_files + sync_gridfs_files + sync_test_files
-
 
-def process_files(files: list[str]) -> None:
+def process_files(
+    files: list[str], docstring_translate_files: list[str], sync_test_files: list[str]
+) -> None:
     for file in files:
         if "__init__" not in file or "__init__" and "test" in file:
             with open(file, "r+") as f:
@@ -374,7 +361,27 @@ def main() -> None:
     unasync_directory(async_files, _pymongo_base, _pymongo_dest_base, replacements)
     unasync_directory(gridfs_files, _gridfs_base, _gridfs_dest_base, replacements)
     unasync_directory(test_files, _test_base, _test_dest_base, replacements)
-    process_files(sync_files + sync_gridfs_files + sync_test_files)
+
+    sync_files = [
+        _pymongo_dest_base + f
+        for f in listdir(_pymongo_dest_base)
+        if (Path(_pymongo_dest_base) / f).is_file()
+    ]
+
+    sync_gridfs_files = [
+        _gridfs_dest_base + f
+        for f in listdir(_gridfs_dest_base)
+        if (Path(_gridfs_dest_base) / f).is_file()
+    ]
+    sync_test_files = [
+        _test_dest_base + f for f in converted_tests if (Path(_test_dest_base) / f).is_file()
+    ]
+
+    docstring_translate_files = sync_files + sync_gridfs_files + sync_test_files
+
+    process_files(
+        sync_files + sync_gridfs_files + sync_test_files, docstring_translate_files, sync_test_files
+    )
 
 
 if __name__ == "__main__":
