Deprecate group()

Author: dstansby

src/zarr/api/asynchronous.py

@@ -622,6 +622,7 @@ async def array(
     return z
 
 
+@deprecated("Use open_group() or create_group() instead")
 async def group(
     *,  # Note: this is a change from v2
     store: StoreLike | None = None,

src/zarr/api/synchronous.py

@@ -384,6 +384,7 @@ def array(data: npt.ArrayLike | Array, **kwargs: Any) -> Array:
     return Array(sync(async_api.array(data=data, **kwargs)))
 
 
+@deprecated("Use open_group() or create_group() instead")
 def group(
     store: StoreLike | None = None,
     *,

tests/test_api.py

@@ -159,7 +159,7 @@ def test_open_normalized_path(
 ) -> None:
     node: Group | Array
     if node_type == "group":
-        node = group(store=memory_store, path=path)
+        node = create_group(store=memory_store, path=path)
     elif node_type == "array":
         node = create(store=memory_store, path=path, shape=(2,))
 
@@ -514,7 +514,7 @@ def test_load_local(tmp_path: Path, path: str | None, load_read_only: bool) -> N
 
 def test_tree() -> None:
     pytest.importorskip("rich")
-    g1 = zarr.group()
+    g1 = zarr.create_group(store={})
     g1.create_group("foo")
     g3 = g1.create_group("bar")
     g3.create_group("baz")
@@ -1379,6 +1379,7 @@ def test_no_overwrite_array(tmp_path: Path, create_function: Callable, overwrite
         assert existing_fpath.exists()
 
 
+@pytest.mark.filterwarnings(r"ignore:Use open_group\(\) or create_group\(\) instead")
 @pytest.mark.parametrize("create_function", [create_group, group])
 @pytest.mark.parametrize("overwrite", [True, False])
 def test_no_overwrite_group(tmp_path: Path, create_function: Callable, overwrite: bool) -> None:  # type:ignore[type-arg]

tests/test_api/test_asynchronous.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import re
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
@@ -115,8 +116,14 @@ async def test_open_group_new_path(tmp_path: Path) -> None:
     """
     # tmp_path exists, but tmp_path / "test.zarr" will not, which is important for this test
     path = tmp_path / "test.zarr"
-    grp = await group(store=path, attributes={"a": 1})
+    with pytest.warns(
+        DeprecationWarning, match=re.escape("Use open_group() or create_group() instead")
+    ):
+        grp = await group(store=path, attributes={"a": 1})
     assert isinstance(grp, AsyncGroup)
     # Calling group on an existing store should just open that store
-    grp = await group(store=path)
+    with pytest.warns(
+        DeprecationWarning, match=re.escape("Use open_group() or create_group() instead")
+    ):
+        grp = await group(store=path)
     assert grp.attrs == {"a": 1}

tests/test_array.py

@@ -1742,7 +1742,7 @@ def test_roundtrip_numcodecs() -> None:
     ]
 
     # Create the array with the correct codecs
-    root = zarr.group(store)
+    root = zarr.create_group(store)
     warn_msg = "Numcodecs codecs are not in the Zarr version 3 specification and may not be supported by other zarr implementations."
     with pytest.warns(UserWarning, match=warn_msg):
         root.create_array(

tests/test_group.py

@@ -1584,7 +1584,7 @@ def test_from_dict_extra_fields(self):
 class TestInfo:
     def test_info(self):
         store = zarr.storage.MemoryStore()
-        A = zarr.group(store=store, path="A")
+        A = zarr.create_group(store=store, path="A")
         B = A.create_group(name="B")
 
         B.create_array(name="x", shape=(1,), dtype="uint8")
@@ -1624,7 +1624,7 @@ def test_update_attrs() -> None:
 @pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
 def test_delitem_removes_children(store: Store, zarr_format: ZarrFormat) -> None:
     # https://github.com/zarr-developers/zarr-python/issues/2191
-    g1 = zarr.group(store=store, zarr_format=zarr_format)
+    g1 = zarr.create_group(store=store, zarr_format=zarr_format)
     g1.create_group("0")
     g1.create_group("0/0")
     arr = g1.create_array("0/0/0", shape=(1,), dtype="uint8")
@@ -2150,7 +2150,7 @@ def test_group_members_performance(store: Store) -> None:
     get_latency = 0.1
 
     # use the input store to create some groups
-    group_create = zarr.group(store=store)
+    group_create = zarr.create_group(store=store)
     num_groups = 10
 
     # Create some groups
@@ -2159,7 +2159,7 @@ def test_group_members_performance(store: Store) -> None:
 
     latency_store = LatencyStore(store, get_latency=get_latency)
     # create a group with some latency on get operations
-    group_read = zarr.group(store=latency_store)
+    group_read = zarr.open_group(store=latency_store)
 
     # check how long it takes to iterate over the groups
     # if .members is sensitive to IO latency,
@@ -2181,7 +2181,7 @@ def test_group_members_concurrency_limit(store: MemoryStore) -> None:
     get_latency = 0.02
 
     # use the input store to create some groups
-    group_create = zarr.group(store=store)
+    group_create = zarr.create_group(store=store)
     num_groups = 10
 
     # Create some groups
@@ -2190,7 +2190,7 @@ def test_group_members_concurrency_limit(store: MemoryStore) -> None:
 
     latency_store = LatencyStore(store, get_latency=get_latency)
     # create a group with some latency on get operations
-    group_read = zarr.group(store=latency_store)
+    group_read = zarr.open_group(store=latency_store)
 
     # check how long it takes to iterate over the groups
     # if .members is sensitive to IO latency,

tests/test_metadata/test_consolidated.py

@@ -13,9 +13,10 @@
 from zarr import AsyncGroup
 from zarr.api.asynchronous import (
     consolidate_metadata,
-    group,
+    create_group,
     open,
     open_consolidated,
+    open_group,
 )
 from zarr.core.buffer import cpu, default_buffer_prototype
 from zarr.core.dtype import parse_dtype
@@ -32,7 +33,7 @@
 
 @pytest.fixture
 async def memory_store_with_hierarchy(memory_store: Store) -> Store:
-    g = await group(store=memory_store, attributes={"foo": "bar"})
+    g = await create_group(store=memory_store, attributes={"foo": "bar"})
     dtype = "uint8"
     await g.create_array(name="air", shape=(1, 2, 3), dtype=dtype)
     await g.create_array(name="lat", shape=(1,), dtype=dtype)
@@ -212,7 +213,7 @@ async def test_consolidated(self, memory_store_with_hierarchy: Store) -> None:
         ]
 
     def test_consolidated_sync(self, memory_store: Store) -> None:
-        g = zarr.api.synchronous.group(store=memory_store, attributes={"foo": "bar"})
+        g = zarr.api.synchronous.create_group(store=memory_store, attributes={"foo": "bar"})
         dtype = "uint8"
         g.create_array(name="air", shape=(1, 2, 3), dtype=dtype)
         g.create_array(name="lat", shape=(1,), dtype=dtype)
@@ -300,7 +301,7 @@ def test_consolidated_sync(self, memory_store: Store) -> None:
         assert group4.metadata == expected
 
     async def test_not_writable_raises(self, memory_store: zarr.storage.MemoryStore) -> None:
-        await group(store=memory_store, attributes={"foo": "bar"})
+        await create_group(store=memory_store, attributes={"foo": "bar"})
         read_store = zarr.storage.MemoryStore(store_dict=memory_store._store_dict, read_only=True)
         with pytest.raises(ValueError, match="does not support writing"):
             await consolidate_metadata(read_store)
@@ -485,7 +486,7 @@ async def test_to_dict_order(
         self, memory_store: zarr.storage.MemoryStore, zarr_format: ZarrFormat
     ) -> None:
         with zarr.config.set(default_zarr_format=zarr_format):
-            g = await group(store=memory_store)
+            g = await create_group(store=memory_store)
 
             # Create groups in non-lexicographix order
             dtype = "float32"
@@ -602,7 +603,7 @@ async def test_use_consolidated_false(
         self, memory_store: zarr.storage.MemoryStore, zarr_format: ZarrFormat
     ) -> None:
         with zarr.config.set(default_zarr_format=zarr_format):
-            g = await group(store=memory_store, attributes={"foo": "bar"})
+            g = await create_group(store=memory_store, attributes={"foo": "bar"})
             await g.create_group(name="a")
 
             # test a stale read
@@ -648,7 +649,7 @@ async def test_stale_child_metadata_ignored(
         # https://github.com/zarr-developers/zarr-python/issues/2921
         # When consolidating metadata, we should ignore any (possibly stale) metadata
         # from previous consolidations, *including at child nodes*.
-        root = await zarr.api.asynchronous.group(store=memory_store, zarr_format=3)
+        root = await zarr.api.asynchronous.create_group(store=memory_store, zarr_format=3)
         await root.create_group("foo")
         await zarr.api.asynchronous.consolidate_metadata(memory_store, path="foo")
         await root.create_group("foo/bar/spam")
@@ -712,7 +713,7 @@ async def test_absolute_path_for_subgroup(self, memory_store: zarr.storage.Memor
 async def test_consolidated_metadata_encodes_special_chars(
     memory_store: Store, zarr_format: ZarrFormat, fill_value: float
 ) -> None:
-    root = await group(store=memory_store, zarr_format=zarr_format)
+    root = await create_group(store=memory_store, zarr_format=zarr_format)
     _time = await root.create_array("time", shape=(12,), dtype=np.float64, fill_value=fill_value)
     if zarr_format == 3:
         with pytest.warns(
@@ -723,7 +724,7 @@ async def test_consolidated_metadata_encodes_special_chars(
     else:
         await zarr.api.asynchronous.consolidate_metadata(memory_store)
 
-    root = await group(store=memory_store, zarr_format=zarr_format)
+    root = await open_group(store=memory_store, zarr_format=zarr_format)
     root_buffer = root.metadata.to_buffer_dict(default_buffer_prototype())
 
     if zarr_format == 2:

tests/test_store/test_local.py

@@ -51,7 +51,7 @@ def test_creates_new_directory(self, tmp_path: pathlib.Path) -> None:
         assert not target.exists()
 
         store = self.store_cls(root=target)
-        zarr.group(store=store)
+        zarr.create_group(store=store)
 
     def test_invalid_root_raises(self) -> None:
         """

tests/test_tree.py

@@ -13,7 +13,7 @@
 def test_tree(root_name: Any) -> None:
     os.environ["OVERRIDE_COLOR_SYSTEM"] = "truecolor"
 
-    g = zarr.group(path=root_name)
+    g = zarr.create_group(store={}, path=root_name)
     A = g.create_group("A")
     B = g.create_group("B")
     C = B.create_group("C")
@@ -57,6 +57,6 @@ def test_tree(root_name: Any) -> None:
 
 
 def test_expand_not_implemented() -> None:
-    g = zarr.group()
+    g = zarr.create_group(store={})
     with pytest.raises(NotImplementedError):
         g.tree(expand=True)

tests/test_v2.py

@@ -75,7 +75,7 @@ async def test_v2_encode_decode(
     dtype: str, expected_dtype: str, fill_value: bytes, fill_value_json: str
 ) -> None:
     store = zarr.storage.MemoryStore()
-    g = zarr.group(store=store, zarr_format=2)
+    g = zarr.create_group(store=store, zarr_format=2)
     g.create_array(
         name="foo", shape=(3,), chunks=(3,), dtype=dtype, fill_value=fill_value, compressor=None
     )