fix argument order in calls of from_array

Author: brokkoli71

src/zarr/api/asynchronous.py

@@ -546,7 +546,7 @@ async def array(
     """
 
     if isinstance(data, Array):
-        return await from_array(data, **kwargs)
+        return await from_array(data=data, **kwargs)
 
     # ensure data is array-like
     if not hasattr(data, "shape") or not hasattr(data, "dtype"):

src/zarr/api/synchronous.py

@@ -1062,23 +1062,23 @@ def from_array(
         >>>     chunks=(10,10),
         >>>     dtype='int32',
         >>>     fill_value=0)
-        >>> arr2 = zarr.from_array(arr, store=store2)
+        >>> arr2 = zarr.from_array(store2, data=arr)
         <Array file://example.zarr shape=(100, 100) dtype=int32>
 
     Create an array from an existing NumPy array::
 
         >>> import numpy as np
         >>> arr3 = zarr.from_array(
-        >>>     np.arange(10000, dtype='i4').reshape(100, 100),
-        >>>     store=zarr.storage.MemoryStore(),
+                zarr.storage.MemoryStore(),
+        >>>     data=np.arange(10000, dtype='i4').reshape(100, 100),
         >>> )
         <Array memory://125477403529984 shape=(100, 100) dtype=int32>
 
     Create an array from any array-like object::
 
         >>> arr4 = zarr.from_array(
-        >>>     [[1, 2], [3, 4]],
-        >>>     store= zarr.storage.MemoryStore(),
+        >>>     zarr.storage.MemoryStore(),
+        >>>     data=[[1, 2], [3, 4]],
         >>> )
         <Array memory://125477392154368 shape=(2, 2) dtype=int64>
         >>> arr4[...]
@@ -1087,8 +1087,8 @@ def from_array(
     Create an array from an existing Array without copying the data::
 
         >>> arr5 = zarr.from_array(
-        >>>     arr4,
-        >>>     store=zarr.storage.MemoryStore(),
+        >>>     zarr.storage.MemoryStore(),
+        >>>     data=arr4,
         >>>     write_data=False,
         >>> )
         <Array memory://140678602965568 shape=(2, 2) dtype=int64>
@@ -1098,9 +1098,9 @@ def from_array(
     return Array(
         sync(
             zarr.core.array.from_array(
-                data,
                 store,
-                write_data,
+                data=data,
+                write_data=write_data,
                 name=name,
                 chunks=chunks,
                 shards=shards,

src/zarr/core/array.py

@@ -3948,22 +3948,22 @@ async def from_array(
         >>>     chunks=(10,10),
         >>>     dtype='int32',
         >>>     fill_value=0)
-        >>> arr2 = await zarr.api.asynchronous.from_array(arr, store=store2)
+        >>> arr2 = await zarr.api.asynchronous.from_array(store2, data=arr)
         <AsyncArray file://example.zarr shape=(100, 100) dtype=int32>
 
     Create an array from an existing NumPy array::
 
         >>> arr3 = await zarr.api.asynchronous.from_array(
-        >>>     np.arange(10000, dtype='i4').reshape(100, 100),
-        >>>     store=zarr.storage.MemoryStore(),
+        >>>     zarr.storage.MemoryStore(),
+        >>>     data=np.arange(10000, dtype='i4').reshape(100, 100),
         >>> )
         <AsyncArray memory://123286956732800 shape=(100, 100) dtype=int32>
 
     Create an array from any array-like object::
 
         >>> arr4 = await zarr.api.asynchronous.from_array(
-        >>>     [[1, 2], [3, 4]],
-        >>>     store=zarr.storage.MemoryStore(),
+        >>>     zarr.storage.MemoryStore(),
+        >>>     data=[[1, 2], [3, 4]],
         >>> )
         <AsyncArray memory://123286959761024 shape=(2, 2) dtype=int64>
         >>> await arr4.getitem(...)
@@ -3972,8 +3972,8 @@ async def from_array(
     Create an array from an existing Array without copying the data::
 
         >>> arr5 = await zarr.api.asynchronous.from_array(
-        >>>     Array(arr4),
-        >>>     store=zarr.storage.MemoryStore(),
+        >>>     zarr.storage.MemoryStore(),
+        >>>     data=Array(arr4),
         >>>     write_data=False,
         >>> )
         <AsyncArray memory://140678602965568 shape=(2, 2) dtype=int64>
@@ -4429,8 +4429,8 @@ async def create_array(
     )
     if data_parsed is not None:
         return await from_array(
+            store,
             data=data_parsed,
-            store=store,
             write_data=write_data,
             name=name,
             chunks=chunks,

tests/test_array.py

@@ -1357,8 +1357,8 @@ async def test_creation_from_other_zarr_format(
 
     src[:] = np.arange(50 * 50).reshape((50, 50))
     result = zarr.from_array(
-        src,
         store=store2,
+        data=src,
         zarr_format=new_format,
     )
     np.testing.assert_array_equal(result[:], src[:])
@@ -1408,7 +1408,7 @@ async def test_from_array(
     new_attributes: dict[str, JSON] = {"foo": "bar"}
 
     result = zarr.from_array(
-        src,
+        data=src,
         store=store2,
         chunks=new_chunks,
         fill_value=new_fill_value,
@@ -1443,7 +1443,7 @@ async def test_from_array_arraylike(
 ) -> None:
     fill_value = 42
     result = zarr.from_array(
-        src, store=store, chunks=chunks, write_data=write_data, fill_value=fill_value
+        store, data=src, chunks=chunks, write_data=write_data, fill_value=fill_value
     )
     if write_data:
         np.testing.assert_array_equal(result[...], np.array(src))