fix merge

Author: brokkoli71

src/zarr/api/synchronous.py

@@ -927,7 +927,7 @@ def from_array(
     dimension_names: Iterable[str] | None = None,
     storage_options: dict[str, Any] | None = None,
     overwrite: bool = False,
-    config: ArrayConfig | ArrayConfigLike | None = None,
+    config: ArrayConfigLike | None = None,
 ) -> Array:
     """Create an array from an existing array or array-like.
 

src/zarr/core/array.py

@@ -4433,7 +4433,7 @@ async def create_array(
         store_path = await make_store_path(
             store, path=name, mode=mode, storage_options=storage_options
         )
-        result = await init_array(
+        return await init_array(
             store_path=store_path,
             shape=shape_parsed,
             dtype=dtype_parsed,
@@ -4449,8 +4449,8 @@ async def create_array(
             chunk_key_encoding=chunk_key_encoding,
             dimension_names=dimension_names,
             overwrite=overwrite,
-        config=config,)
-        return AsyncArray(metadata=meta, store_path=store_path, config=config_parsed)
+            config=config,
+        )
 
 
 def _parse_keep_array_attr(

tests/test_indexing.py

@@ -1963,8 +1963,3 @@ def test_iter_chunk_regions():
         assert_array_equal(a[region], np.ones_like(a[region]))
         a[region] = 0
         assert_array_equal(a[region], np.zeros_like(a[region]))
-
-
-def test_is_total_slice():
-    assert is_total_slice((0, slice(4, 6)), (1, 2))
-    assert is_total_slice((slice(0, 1, None), slice(4, 6)), (1, 2))