update config test

Author: d-v-b

tests/test_config.py

@@ -24,7 +24,7 @@
 from zarr.core.buffer import NDBuffer
 from zarr.core.codec_pipeline import BatchedCodecPipeline
 from zarr.core.config import BadConfigError, config
-from zarr.core.dtype import get_data_type_from_native_dtype
+from zarr.core.dtype._numpy import Int8, VariableLengthString
 from zarr.core.indexing import SelectorTuple
 from zarr.registry import (
     fully_qualified_name,
@@ -48,55 +48,60 @@
 
 def test_config_defaults_set() -> None:
     # regression test for available defaults
-    assert config.defaults == [
-        {
-            "default_zarr_format": 3,
-            "array": {
-                "order": "C",
-                "write_empty_chunks": False,
-                "v2_default_compressor": {"default": {"id": "zstd", "level": 0, "checksum": False}},
-                "v2_default_filters": {
-                    "default": None,
-                    "numpy__variable_length_utf8": [{"id": "vlen-utf8"}],
-                    "numpy__fixed_length_ucs4": [{"id": "vlen-utf8"}],
-                    "numpy__fixed_length_ascii": [{"id": "vlen-bytes"}],
+    assert (
+        config.defaults
+        == [
+            {
+                "default_zarr_format": 3,
+                "array": {
+                    "order": "C",
+                    "write_empty_chunks": False,
+                    "v2_default_compressor": {
+                        "default": {"id": "zstd", "level": 0, "checksum": False},
+                        "variable-length-string": {"id": "zstd", "level": 0, "checksum": False},
+                    },
+                    "v2_default_filters": {
+                        "default": None,
+                        "variable-length-string": [{"id": "vlen-utf8"}],
+                    },
+                    "v3_default_filters": {"default": [], "variable-length-string": []},
+                    "v3_default_serializer": {
+                        "default": {"name": "bytes", "configuration": {"endian": "little"}},
+                        "variable-length-string": {"name": "vlen-utf8"},
+                    },
+                    "v3_default_compressors": {
+                        "default": [
+                            {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
+                        ],
+                        "variable-length-string": [
+                            {"name": "zstd", "configuration": {"level": 0, "checksum": False}}
+                        ],
+                    },
                 },
-                "v3_default_filters": {"default": []},
-                "v3_default_serializer": {
-                    "default": {"name": "bytes", "configuration": {"endian": "little"}},
-                    "numpy__variable_length_utf8": {"name": "vlen-utf8"},
-                    "numpy__fixed_length_ucs4": {"name": "vlen-utf8"},
-                    "r*": {"name": "vlen-bytes"},
+                "async": {"concurrency": 10, "timeout": None},
+                "threading": {"max_workers": None},
+                "json_indent": 2,
+                "codec_pipeline": {
+                    "path": "zarr.core.codec_pipeline.BatchedCodecPipeline",
+                    "batch_size": 1,
                 },
-                "v3_default_compressors": {
-                    "default": [
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
-                    ]
+                "codecs": {
+                    "blosc": "zarr.codecs.blosc.BloscCodec",
+                    "gzip": "zarr.codecs.gzip.GzipCodec",
+                    "zstd": "zarr.codecs.zstd.ZstdCodec",
+                    "bytes": "zarr.codecs.bytes.BytesCodec",
+                    "endian": "zarr.codecs.bytes.BytesCodec",  # compatibility with earlier versions of ZEP1
+                    "crc32c": "zarr.codecs.crc32c_.Crc32cCodec",
+                    "sharding_indexed": "zarr.codecs.sharding.ShardingCodec",
+                    "transpose": "zarr.codecs.transpose.TransposeCodec",
+                    "vlen-utf8": "zarr.codecs.vlen_utf8.VLenUTF8Codec",
+                    "vlen-bytes": "zarr.codecs.vlen_utf8.VLenBytesCodec",
                 },
-            },
-            "async": {"concurrency": 10, "timeout": None},
-            "threading": {"max_workers": None},
-            "json_indent": 2,
-            "codec_pipeline": {
-                "path": "zarr.core.codec_pipeline.BatchedCodecPipeline",
-                "batch_size": 1,
-            },
-            "buffer": "zarr.core.buffer.cpu.Buffer",
-            "ndbuffer": "zarr.core.buffer.cpu.NDBuffer",
-            "codecs": {
-                "blosc": "zarr.codecs.blosc.BloscCodec",
-                "gzip": "zarr.codecs.gzip.GzipCodec",
-                "zstd": "zarr.codecs.zstd.ZstdCodec",
-                "bytes": "zarr.codecs.bytes.BytesCodec",
-                "endian": "zarr.codecs.bytes.BytesCodec",
-                "crc32c": "zarr.codecs.crc32c_.Crc32cCodec",
-                "sharding_indexed": "zarr.codecs.sharding.ShardingCodec",
-                "transpose": "zarr.codecs.transpose.TransposeCodec",
-                "vlen-utf8": "zarr.codecs.vlen_utf8.VLenUTF8Codec",
-                "vlen-bytes": "zarr.codecs.vlen_utf8.VLenBytesCodec",
-            },
-        }
-    ]
+                "buffer": "zarr.core.buffer.cpu.Buffer",
+                "ndbuffer": "zarr.core.buffer.cpu.NDBuffer",
+            }
+        ]
+    )
     assert config.get("array.order") == "C"
     assert config.get("async.concurrency") == 10
     assert config.get("async.timeout") is None
@@ -297,23 +302,26 @@ class NewCodec2(BytesCodec):
         get_codec_class("new_codec")
 
 
-@pytest.mark.parametrize("dtype", ["int", "bytes", "str"])
-async def test_default_codecs(dtype: str) -> None:
+@pytest.mark.parametrize("dtype_category", ["variable-length-string", "default"])
+async def test_default_codecs(dtype_category: str) -> None:
     """
     Test that the default compressors are sensitive to the current setting of the config.
     """
-    zdtype = get_data_type_from_native_dtype(dtype)
+    if dtype_category == "variable-length-string":
+        zdtype = VariableLengthString()
+    else:
+        zdtype = Int8()
     expected_compressors = (GzipCodec(),)
     new_conf = {
-        f"array.v3_default_compressors.{zdtype._zarr_v3_name.replace('.', '__')}": [
+        f"array.v3_default_compressors.{dtype_category}": [
             c.to_dict() for c in expected_compressors
         ]
     }
     with config.set(new_conf):
         arr = await create_array(
             shape=(100,),
             chunks=(100,),
-            dtype=dtype,
+            dtype=zdtype,
             zarr_format=3,
             store=MemoryStore(),
         )