move test_scalar_wrapper to test_buffer.py

Author: brokkoli71

src/zarr/core/buffer/core.py

@@ -159,8 +159,8 @@ def astype(
         self, dtype: npt.DTypeLike, order: Literal["K", "A", "C", "F"] = "K", *, copy: bool = True
     ) -> Self:
         if copy:
-            return self.__class__(self._value, dtype)
-        self._dtype = dtype
+            return self.__class__(self._value, np.dtype(dtype))
+        self._dtype = np.dtype(dtype)
         return self
 
     def fill(self, value: Any) -> None:

tests/test_array.py

@@ -1258,54 +1258,6 @@ async def test_create_array_v2_no_shards(store: MemoryStore) -> None:
         )
 
 
-@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1), False, True])
-def test_scalar_wrapper(value: Any) -> None:
-    x = ScalarWrapper(value)
-    assert x == value
-    assert value == x
-    assert x == x[()]
-    assert x.view(str) == x
-    assert x.copy() == x
-    assert x.transpose() == x
-    assert x.ravel() == x
-    assert x.all() == bool(value)
-    if isinstance(value, (int, float)):
-        assert -x == -value
-        assert abs(x) == abs(value)
-        assert int(x) == int(value)
-        assert float(x) == float(value)
-        assert complex(x) == complex(value)
-        assert x + 1 == value + 1
-        assert x - 1 == value - 1
-        assert x * 2 == value * 2
-        assert x / 2 == value / 2
-        assert x // 2 == value // 2
-        assert x % 2 == value % 2
-        assert x**2 == value**2
-        assert x == value
-        assert x != value + 1
-        assert bool(x) == bool(value)
-        assert hash(x) == hash(value)
-        assert str(x) == str(value)
-        assert format(x, "") == format(value, "")
-        x.fill(2)
-        x[()] += 1
-        assert x == 3
-    elif isinstance(value, str):
-        assert str(x) == value
-        with pytest.raises(TypeError, match=re.escape("bad operand type for abs(): 'str'")):
-            abs(x)
-
-    with pytest.raises(ValueError, match="Cannot reshape scalar to non-scalar shape."):
-        x.reshape((1, 2))
-    with pytest.raises(IndexError, match="Invalid index for scalar."):
-        x[10] = value
-    with pytest.raises(IndexError, match="Invalid index for scalar."):
-        x[10]
-    with pytest.raises(TypeError, match=re.escape("len() of unsized object.")):
-        len(x)
-
-
 @pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1)])
 @pytest.mark.parametrize("zarr_format", [2, 3])
 def test_scalar_array(value: Any, zarr_format: ZarrFormat) -> None:

tests/test_buffer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import re
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 import pytest
@@ -30,6 +31,9 @@
     cp = None
 
 
+import zarr.api.asynchronous
+from zarr.core.buffer.core import ScalarWrapper
+
 if TYPE_CHECKING:
     import types
 
@@ -40,6 +44,54 @@ def test_nd_array_like(xp: types.ModuleType) -> None:
     assert isinstance(ary, NDArrayLike)
 
 
+@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1), False, True])
+def test_scalar_wrapper(value: Any) -> None:
+    x = ScalarWrapper(value)
+    assert x == value
+    assert value == x
+    assert x == x[()]
+    assert x.view(str) == x
+    assert x.copy() == x
+    assert x.transpose() == x
+    assert x.ravel() == x
+    assert x.all() == bool(value)
+    if isinstance(value, (int, float)):
+        assert -x == -value
+        assert abs(x) == abs(value)
+        assert int(x) == int(value)
+        assert float(x) == float(value)
+        assert complex(x) == complex(value)
+        assert x + 1 == value + 1
+        assert x - 1 == value - 1
+        assert x * 2 == value * 2
+        assert x / 2 == value / 2
+        assert x // 2 == value // 2
+        assert x % 2 == value % 2
+        assert x**2 == value**2
+        assert x == value
+        assert x != value + 1
+        assert bool(x) == bool(value)
+        assert hash(x) == hash(value)
+        assert str(x) == str(value)
+        assert format(x, "") == format(value, "")
+        x.fill(2)
+        x[()] += 1
+        assert x == 3
+    elif isinstance(value, str):
+        assert str(x) == value
+        with pytest.raises(TypeError, match=re.escape("bad operand type for abs(): 'str'")):
+            abs(x)
+
+    with pytest.raises(ValueError, match="Cannot reshape scalar to non-scalar shape."):
+        x.reshape((1, 2))
+    with pytest.raises(IndexError, match="Invalid index for scalar."):
+        x[10] = value
+    with pytest.raises(IndexError, match="Invalid index for scalar."):
+        x[10]
+    with pytest.raises(TypeError, match=re.escape("len() of unsized object.")):
+        len(x)
+
+
 @pytest.mark.asyncio
 async def test_async_array_prototype() -> None:
     """Test the use of a custom buffer prototype"""