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

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -146,7 +146,7 @@ buildvariants:
       COMPRESSOR: zlib
   - name: compression-zstd-rhel8
     tasks:
-      - name: .test-standard !.server-4.0
+      - name: .test-standard !.server-4.2
     display_name: Compression zstd RHEL8
     run_on:
       - rhel87-small
@@ -522,13 +522,6 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
   # Server version tests
-  - name: mongodb-v4.0
-    tasks:
-      - name: .server-version
-    display_name: "* MongoDB v4.0"
-    run_on:
-      - rhel87-small
-    tags: [coverage_tag]
   - name: mongodb-v4.2
     tasks:
       - name: .server-version
@@ -664,11 +657,3 @@ buildvariants:
       - rhel87-small
     expansions:
       STORAGE_ENGINE: inmemory
-  - name: storage-mmapv1-rhel8
-    tasks:
-      - name: .test-standard !.sharded_cluster-auth-ssl .server-4.0
-    display_name: Storage MMAPv1 RHEL8
-    run_on:
-      - rhel87-small
-    expansions:
-      STORAGE_ENGINE: mmapv1

.evergreen/generated_configs/variants.yml

@@ -25,7 +25,6 @@
     get_task_name,
     get_variant_name,
     get_versions_from,
-    get_versions_until,
     handle_c_ext,
     write_functions_to_file,
     write_tasks_to_file,
@@ -196,7 +195,7 @@ def create_compression_variants():
     for compressor in "snappy", "zlib", "zstd":
         expansions = dict(COMPRESSOR=compressor)
         if compressor == "zstd":
-            tasks = [".test-standard !.server-4.0"]
+            tasks = [".test-standard !.server-4.2"]
         else:
             tasks = [".test-standard"]
         display_name = get_variant_name(f"Compression {compressor}", host)
@@ -249,16 +248,11 @@ def create_pyopenssl_variants():
 
 def create_storage_engine_variants():
     host = DEFAULT_HOST
-    engines = ["InMemory", "MMAPv1"]
+    engines = ["InMemory"]
     variants = []
     for engine in engines:
         expansions = dict(STORAGE_ENGINE=engine.lower())
-        if engine == engines[0]:
-            tasks = [".test-standard .standalone-noauth-nossl"]
-        else:
-            # MongoDB 4.2 drops support for MMAPv1
-            versions = get_versions_until("4.0")
-            tasks = [f".test-standard !.sharded_cluster-auth-ssl .server-{v}" for v in versions]
+        tasks = [".test-standard .standalone-noauth-nossl"]
         display_name = get_variant_name(f"Storage {engine}", host)
         variant = create_variant(tasks, display_name, host=host, expansions=expansions)
         variants.append(variant)

.evergreen/scripts/generate_config.py

@@ -21,7 +21,7 @@
 # Globals
 ##############
 
-ALL_VERSIONS = ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
+ALL_VERSIONS = ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
 CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 PYPYS = ["pypy3.10"]
 ALL_PYTHONS = CPYTHONS + PYPYS

.evergreen/scripts/generate_config_utils.py

@@ -490,6 +490,11 @@ def as_vector(self) -> BinaryVector:
         dtype = BinaryVectorDtype(dtype)
         n_values = len(self) - position
 
+        if padding and dtype != BinaryVectorDtype.PACKED_BIT:
+            raise ValueError(
+                f"Corrupt data. Padding ({padding}) must be 0 for all but PACKED_BIT dtypes. ({dtype=})"
+            )
+
         if dtype == BinaryVectorDtype.INT8:
             dtype_format = "b"
             format_string = f"<{n_values}{dtype_format}"
@@ -510,6 +515,10 @@ def as_vector(self) -> BinaryVector:
 
         elif dtype == BinaryVectorDtype.PACKED_BIT:
             # data packed as uint8
+            if padding and not n_values:
+                raise ValueError("Corrupt data. Vector has a padding P, but no data.")
+            if padding > 7 or padding < 0:
+                raise ValueError(f"Corrupt data. Padding ({padding}) must be between 0 and 7.")
             dtype_format = "B"
             format_string = f"<{n_values}{dtype_format}"
             unpacked_uint8s = list(struct.unpack_from(format_string, self, position))

bson/binary.py

@@ -8,6 +8,9 @@ PyMongo 4.14 brings a number of changes including:
 - Added :attr:`bson.codec_options.TypeRegistry.codecs` and :attr:`bson.codec_options.TypeRegistry.fallback_encoder` properties
   to allow users to directly access the type codecs and fallback encoder for a given :class:`bson.codec_options.TypeRegistry`.
 
+- Introduces a minor breaking change. When encoding :class:`bson.binary.BinaryVector`, a ``ValueError`` will be raised
+  if the 'padding' metadata field is < 0 or > 7, or non-zero for any type other than PACKED_BIT.
+
 Changes in Version 4.13.2 (2025/06/17)
 --------------------------------------
 

doc/changelog.rst

@@ -66,8 +66,8 @@
 MAX_WRITE_BATCH_SIZE = 100000
 
 # What this version of PyMongo supports.
-MIN_SUPPORTED_SERVER_VERSION = "4.0"
-MIN_SUPPORTED_WIRE_VERSION = 7
+MIN_SUPPORTED_SERVER_VERSION = "4.2"
+MIN_SUPPORTED_WIRE_VERSION = 8
 # MongoDB 8.0
 MAX_SUPPORTED_WIRE_VERSION = 25
 

pymongo/common.py

@@ -509,19 +509,6 @@ def require_data_lake(self, func):
             func=func,
         )
 
-    def require_no_mmap(self, func):
-        """Run a test only if the server is not using the MMAPv1 storage
-        engine. Only works for standalone and replica sets; tests are
-        run regardless of storage engine on sharded clusters.
-        """
-
-        def is_not_mmap():
-            if self.is_mongos:
-                return True
-            return self.storage_engine != "mmapv1"
-
-        return self._require(is_not_mmap, "Storage engine must not be MMAPv1", func=func)
-
     def require_version_min(self, *ver):
         """Run a test only if the server version is at least ``version``."""
         other_version = Version(*ver)
@@ -652,7 +639,7 @@ def require_no_load_balancer(self, func):
 
     def require_change_streams(self, func):
         """Run a test only if the server supports change streams."""
-        return self.require_no_mmap(self.require_no_standalone(func))
+        return self.require_no_standalone(func)
 
     def is_topology_type(self, topologies):
         unknown = set(topologies) - {
@@ -755,8 +742,6 @@ def require_sessions(self, func):
         return self._require(lambda: self.sessions_enabled, "Sessions not supported", func=func)
 
     def supports_retryable_writes(self):
-        if self.storage_engine == "mmapv1":
-            return False
         if not self.sessions_enabled:
             return False
         return self.is_mongos or self.is_rs
@@ -770,9 +755,6 @@ def require_retryable_writes(self, func):
         )
 
     def supports_transactions(self):
-        if self.storage_engine == "mmapv1":
-            return False
-
         if self.version.at_least(4, 1, 8):
             return self.is_mongos or self.is_rs
 

test/__init__.py

@@ -509,19 +509,6 @@ def require_data_lake(self, func):
             func=func,
         )
 
-    def require_no_mmap(self, func):
-        """Run a test only if the server is not using the MMAPv1 storage
-        engine. Only works for standalone and replica sets; tests are
-        run regardless of storage engine on sharded clusters.
-        """
-
-        def is_not_mmap():
-            if self.is_mongos:
-                return True
-            return self.storage_engine != "mmapv1"
-
-        return self._require(is_not_mmap, "Storage engine must not be MMAPv1", func=func)
-
     def require_version_min(self, *ver):
         """Run a test only if the server version is at least ``version``."""
         other_version = Version(*ver)
@@ -652,7 +639,7 @@ def require_no_load_balancer(self, func):
 
     def require_change_streams(self, func):
         """Run a test only if the server supports change streams."""
-        return self.require_no_mmap(self.require_no_standalone(func))
+        return self.require_no_standalone(func)
 
     async def is_topology_type(self, topologies):
         unknown = set(topologies) - {
@@ -755,8 +742,6 @@ def require_sessions(self, func):
         return self._require(lambda: self.sessions_enabled, "Sessions not supported", func=func)
 
     def supports_retryable_writes(self):
-        if self.storage_engine == "mmapv1":
-            return False
         if not self.sessions_enabled:
             return False
         return self.is_mongos or self.is_rs
@@ -770,9 +755,6 @@ def require_retryable_writes(self, func):
         )
 
     def supports_transactions(self):
-        if self.storage_engine == "mmapv1":
-            return False
-
         if self.version.at_least(4, 1, 8):
             return self.is_mongos or self.is_rs
 

test/asynchronous/__init__.py

@@ -165,7 +165,7 @@ async def _test_update_many(self, update):
     async def test_update_many(self):
         await self._test_update_many({"$set": {"foo": "bar"}})
 
-    @async_client_context.require_version_min(4, 1, 11)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_update_many_pipeline(self):
         await self._test_update_many([{"$set": {"foo": "bar"}}])
 
@@ -206,7 +206,7 @@ async def _test_update_one(self, update):
     async def test_update_one(self):
         await self._test_update_one({"$set": {"foo": "bar"}})
 
-    @async_client_context.require_version_min(4, 1, 11)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_update_one_pipeline(self):
         await self._test_update_one([{"$set": {"foo": "bar"}}])