Merge branch 'master' into PYTHON-4786

Author: NoahStapp

bson/binary.py

@@ -432,7 +432,7 @@ def from_vector(
             raise NotImplementedError("%s not yet supported" % dtype)
 
         metadata = struct.pack("<sB", dtype.value, padding)
-        data = struct.pack(f"{len(vector)}{format_str}", *vector)
+        data = struct.pack(f"<{len(vector)}{format_str}", *vector)
         return cls(metadata + data, subtype=VECTOR_SUBTYPE)
 
     def as_vector(self) -> BinaryVector:
@@ -454,7 +454,7 @@ def as_vector(self) -> BinaryVector:
 
         if dtype == BinaryVectorDtype.INT8:
             dtype_format = "b"
-            format_string = f"{n_values}{dtype_format}"
+            format_string = f"<{n_values}{dtype_format}"
             vector = list(struct.unpack_from(format_string, self, position))
             return BinaryVector(vector, dtype, padding)
 
@@ -465,13 +465,16 @@ def as_vector(self) -> BinaryVector:
                 raise ValueError(
                     "Corrupt data. N bytes for a float32 vector must be a multiple of 4."
                 )
-            vector = list(struct.unpack_from(f"{n_values}f", self, position))
+            dtype_format = "f"
+            format_string = f"<{n_values}{dtype_format}"
+            vector = list(struct.unpack_from(format_string, self, position))
             return BinaryVector(vector, dtype, padding)
 
         elif dtype == BinaryVectorDtype.PACKED_BIT:
             # data packed as uint8
             dtype_format = "B"
-            unpacked_uint8s = list(struct.unpack_from(f"{n_values}{dtype_format}", self, position))
+            format_string = f"<{n_values}{dtype_format}"
+            unpacked_uint8s = list(struct.unpack_from(format_string, self, position))
             return BinaryVector(unpacked_uint8s, dtype, padding)
 
         else:

hatch.toml

@@ -43,7 +43,7 @@ features = ["test"]
 test = "pytest -v --durations=5 --maxfail=10 {args}"
 test-eg = "bash ./.evergreen/run-tests.sh {args}"
 test-async = "pytest -v --durations=5 --maxfail=10 -m default_async {args}"
-test-mockupdb = ["pip install -U git+https://github.com/ajdavis/mongo-mockup-db@master", "test -m mockupdb"]
+test-mockupdb = ["pip install -U git+https://github.com/mongodb-labs/mongo-mockup-db@master", "test -m mockupdb"]
 
 [envs.encryption]
 skip-install = true

test/mockupdb/test_handshake.py

@@ -26,7 +26,7 @@
 
 
 from bson.objectid import ObjectId
-from pymongo import MongoClient
+from pymongo import MongoClient, has_c
 from pymongo import version as pymongo_version
 from pymongo.errors import OperationFailure
 from pymongo.server_api import ServerApi, ServerApiVersion
@@ -39,7 +39,11 @@ def _check_handshake_data(request):
     data = request["client"]
 
     assert data["application"] == {"name": "my app"}
-    assert data["driver"] == {"name": "PyMongo", "version": pymongo_version}
+    if has_c():
+        name = "PyMongo|c"
+    else:
+        name = "PyMongo"
+    assert data["driver"] == {"name": name, "version": pymongo_version}
 
     # Keep it simple, just check these fields exist.
     assert "os" in data