Merge branch 'main' of github.com:zarr-developers/zarr-python into re…

…factor-warnings

src/zarr/api/asynchronous.py

@@ -40,8 +40,8 @@
     create_hierarchy,
 )
 from zarr.core.metadata import ArrayMetadataDict, ArrayV2Metadata, ArrayV3Metadata
-from zarr.core.metadata.v2 import _default_compressor, _default_filters
-from zarr.errors import NodeTypeValidationError, ZarrDeprecationWarning
+from zarr.errors import GroupNotFoundError, NodeTypeValidationError, ZarrDeprecationWarning
+from zarr.storage import StorePath
 from zarr.storage._common import make_store_path
 
 if TYPE_CHECKING:
@@ -535,7 +535,7 @@
     await asyncio.gather(*aws)
 
 
 @deprecated("Use AsyncGroup.tree instead.", category=ZarrDeprecationWarning)
 async def tree(grp: AsyncGroup, expand: bool | None = None, level: int | None = None) -> Any:
     """Provide a rich display of the hierarchy.
 

tests/test_api.py

@@ -5,6 +5,8 @@
 
 import zarr.codecs
 import zarr.storage
+from zarr.storage._local import LocalStore
+from zarr.storage._zip import ZipStore
 
 if TYPE_CHECKING:
     import pathlib

tests/test_v2.py

@@ -229,41 +229,9 @@ def test_v2_non_contiguous(numpy_order: Literal["C", "F"], zarr_order: Literal["
         assert (sub_arr).flags.c_contiguous
 
 
-def test_default_compressor_deprecation_warning():
+def test_default_compressor_deprecation_warning() -> None:
     with pytest.warns(ZarrDeprecationWarning, match="default_compressor is deprecated"):
-        zarr.storage.default_compressor = "zarr.codecs.zstd.ZstdCodec()"
-
-
-@pytest.mark.parametrize(
-    "dtype_expected",
-    [
-        ["b", "zstd", None],
-        ["i", "zstd", None],
-        ["f", "zstd", None],
-        ["|S1", "zstd", "vlen-bytes"],
-        ["|U1", "zstd", "vlen-utf8"],
-    ],
-)
-def test_default_filters_and_compressor(dtype_expected: Any) -> None:
-    with config.set(
-        {
-            "array.v2_default_compressor": {
-                "numeric": {"id": "zstd", "level": "0"},
-                "string": {"id": "zstd", "level": "0"},
-                "bytes": {"id": "zstd", "level": "0"},
-            },
-            "array.v2_default_filters": {
-                "numeric": [],
-                "string": [{"id": "vlen-utf8"}],
-                "bytes": [{"id": "vlen-bytes"}],
-            },
-        }
-    ):
-        dtype, expected_compressor, expected_filter = dtype_expected
-        arr = zarr.create(shape=(3,), path="foo", store={}, zarr_format=2, dtype=dtype)
-        assert arr.metadata.compressor.codec_id == expected_compressor
-        if expected_filter is not None:
-            assert arr.metadata.filters[0].codec_id == expected_filter
+        zarr.storage.default_compressor = "zarr.codecs.zstd.ZstdCodec()"  # type: ignore[attr-defined]
 
 
 @pytest.mark.parametrize("fill_value", [None, (b"", 0, 0.0)], ids=["no_fill", "fill"])