Merge branch 'main' into feat/read-funcs

Author: d-v-b

.github/workflows/test.yml

@@ -33,15 +33,14 @@ jobs:
             numpy-version: '2.1'
             dependency-set: 'optional'
             os: 'macos-latest'
-          # https://github.com/zarr-developers/zarr-python/issues/2438
-          # - python-version: '3.11'
-          #   numpy-version: '1.25'
-          #   dependency-set: 'optional'
-          #   os: 'windows-latest'
-          # - python-version: '3.13'
-          #   numpy-version: '2.1'
-          #   dependency-set: 'optional'
-          #   os: 'windows-latest'
+          - python-version: '3.11'
+            numpy-version: '1.25'
+            dependency-set: 'optional'
+            os: 'windows-latest'
+          - python-version: '3.13'
+            numpy-version: '2.1'
+            dependency-set: 'optional'
+            os: 'windows-latest'
     runs-on: ${{ matrix.os }}
 
     steps:

src/zarr/core/group.py

@@ -967,7 +967,7 @@ async def create_array(
 
     @deprecated("Use AsyncGroup.create_array instead.")
     async def create_dataset(
-        self, name: str, **kwargs: Any
+        self, name: str, *, shape: ShapeLike, **kwargs: Any
     ) -> AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata]:
         """Create an array.
 
@@ -988,7 +988,7 @@ async def create_dataset(
         .. deprecated:: 3.0.0
             The h5py compatibility methods will be removed in 3.1.0. Use `AsyncGroup.create_array` instead.
         """
-        return await self.create_array(name, **kwargs)
+        return await self.create_array(name, shape=shape, **kwargs)
 
     @deprecated("Use AsyncGroup.require_array instead.")
     async def require_dataset(
@@ -1666,7 +1666,7 @@ def create_dataset(self, name: str, **kwargs: Any) -> Array:
         return Array(self._sync(self._async_group.create_dataset(name, **kwargs)))
 
     @deprecated("Use Group.require_array instead.")
-    def require_dataset(self, name: str, **kwargs: Any) -> Array:
+    def require_dataset(self, name: str, *, shape: ShapeLike, **kwargs: Any) -> Array:
         """Obtain an array, creating if it doesn't exist.
 
         Arrays are known as "datasets" in HDF5 terminology. For compatibility
@@ -1688,9 +1688,9 @@ def require_dataset(self, name: str, **kwargs: Any) -> Array:
         .. deprecated:: 3.0.0
             The h5py compatibility methods will be removed in 3.1.0. Use `Group.require_array` instead.
         """
-        return Array(self._sync(self._async_group.require_array(name, **kwargs)))
+        return Array(self._sync(self._async_group.require_array(name, shape=shape, **kwargs)))
 
-    def require_array(self, name: str, **kwargs: Any) -> Array:
+    def require_array(self, name: str, *, shape: ShapeLike, **kwargs: Any) -> Array:
         """Obtain an array, creating if it doesn't exist.
 
 
@@ -1707,7 +1707,7 @@ def require_array(self, name: str, **kwargs: Any) -> Array:
         -------
         a : Array
         """
-        return Array(self._sync(self._async_group.require_array(name, **kwargs)))
+        return Array(self._sync(self._async_group.require_array(name, shape=shape, **kwargs)))
 
     @_deprecate_positional_args
     def empty(self, *, name: str, shape: ChunkCoords, **kwargs: Any) -> Array:

src/zarr/storage/local.py

@@ -132,7 +132,7 @@ def with_mode(self, mode: AccessModeLiteral) -> Self:
         return type(self)(root=self.root, mode=mode)
 
     def __str__(self) -> str:
-        return f"file://{self.root}"
+        return f"file://{self.root.as_posix()}"
 
     def __repr__(self) -> str:
         return f"LocalStore({str(self)!r})"
@@ -235,11 +235,9 @@ async def list_prefix(self, prefix: str) -> AsyncGenerator[str]:
     async def list_dir(self, prefix: str) -> AsyncGenerator[str]:
         # docstring inherited
         base = self.root / prefix
-        to_strip = str(base) + "/"
-
         try:
             key_iter = base.iterdir()
             for key in key_iter:
-                yield key.as_posix().replace(to_strip, "")
+                yield key.relative_to(base).as_posix()
         except (FileNotFoundError, NotADirectoryError):
             pass

tests/test_store/test_local.py

@@ -31,7 +31,7 @@ def store_kwargs(self, tmpdir) -> dict[str, str]:
         return {"root": str(tmpdir), "mode": "r+"}
 
     def test_store_repr(self, store: LocalStore) -> None:
-        assert str(store) == f"file://{store.root!s}"
+        assert str(store) == f"file://{store.root.as_posix()!s}"
 
     def test_store_supports_writes(self, store: LocalStore) -> None:
         assert store.supports_writes