Merge branch 'main' into ig/spec0_py314

Author: ilan-gold

changes/3603.bugfix.md

@@ -0,0 +1 @@
+Correct the target bytes number for auto-chunking when auto-sharding.

changes/3605.misc.md

@@ -0,0 +1 @@
+Fix a bug in the test suite that prevented stand-alone example scripts from being tested.

pyproject.toml

@@ -75,7 +75,7 @@ test = [
     "coverage>=7.10",
     # Pin possibly due to https://github.com/pytest-dev/pytest-cov/issues/693
     "pytest<8.4",
-    "pytest-asyncio",
+    "pytest-asyncio<1.2.0",
     "pytest-cov",
     "pytest-accept",
     "rich",

src/zarr/core/chunk_grids.py

@@ -62,6 +62,8 @@ def _guess_chunks(
     tuple[int, ...]
 
     """
+    if min_bytes >= max_bytes:
+        raise ValueError(f"Cannot have more min_bytes ({min_bytes}) than max_bytes ({max_bytes})")
     if isinstance(shape, int):
         shape = (shape,)
 
@@ -264,7 +266,7 @@ def _auto_partition(
     else:
         if chunk_shape == "auto":
             # aim for a 1MiB chunk
-            _chunks_out = _guess_chunks(array_shape, item_size, max_bytes=1024)
+            _chunks_out = _guess_chunks(array_shape, item_size, max_bytes=1048576)
         else:
             _chunks_out = chunk_shape
 

tests/test_array.py

@@ -1019,6 +1019,24 @@ def test_auto_partition_auto_shards(
     assert auto_shards == expected_shards
 
 
+def test_auto_partition_auto_shards_with_auto_chunks_should_be_close_to_1MiB() -> None:
+    """
+    Test that automatically picking a shard size and a chunk size gives roughly 1MiB chunks.
+    """
+    with pytest.warns(
+        ZarrUserWarning,
+        match="Automatic shard shape inference is experimental and may change without notice.",
+    ):
+        with zarr.config.set({"array.target_shard_size_bytes": 10_000_000}):
+            _, chunk_shape = _auto_partition(
+                array_shape=(10_000_000,),
+                chunk_shape="auto",
+                shard_shape="auto",
+                item_size=1,
+            )
+    assert chunk_shape == (625000,)
+
+
 def test_chunks_and_shards() -> None:
     store = StorePath(MemoryStore())
     shape = (100, 100)

tests/test_examples.py

@@ -11,7 +11,7 @@
 from packaging.requirements import Requirement
 
 examples_dir = "examples"
-script_paths = Path(examples_dir).glob("*.py")
+script_paths = tuple(Path(examples_dir).rglob("*.py"))
 
 PEP_723_REGEX: Final = r"(?m)^# /// (?P<type>[a-zA-Z0-9-]+)$\s(?P<content>(^#(| .*)$\s)+)^# ///$"
 
@@ -62,6 +62,13 @@ def resave_script(source_path: Path, dest_path: Path) -> None:
     dest_path.write_text(dest_text)
 
 
+def test_script_paths() -> None:
+    """
+    Test that our test fixture is working properly and collecting script paths.
+    """
+    assert len(script_paths) > 0
+
+
 @pytest.mark.skipif(
     sys.platform in ("win32",), reason="This test fails due for unknown reasons on Windows in CI."
 )