Merge branch 'main' into benchmark-smoke-test

Author: d-v-b

.github/workflows/releases.yml

@@ -1,6 +1,9 @@
 name: Wheels
 
 on:
+  release:
+    types:
+      - published
   push:
     branches: [main]
   pull_request:
@@ -64,7 +67,7 @@ jobs:
     name: Upload to PyPI
     needs: [build_artifacts, test_dist_pypi]
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+    if: github.event_name == 'release'
     environment:
       name: releases
       url: https://pypi.org/p/zarr

TEAM.md

@@ -10,6 +10,7 @@
 - @dstansby (David Stansby)
 - @dcherian (Deepak Cherian)
 - @TomAugspurger (Tom Augspurger)
+- @maxrjones (Max Jones)
 
 ## Emeritus core-developers
 - @alimanfoo (Alistair Miles)

changes/3846.bugfix.md

@@ -0,0 +1 @@
+Fix `ZipStore.list()`, `list_dir()`, and `exists()` to auto-open the zip file when called before `open()`, consistent with the existing behavior of `get()` and `set()`.

docs/release-notes.md

@@ -461,7 +461,7 @@
 - Test that a `ValueError` is raised for invalid byte range syntax in `StoreTests`. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
 - Separate instantiating and opening a store in `StoreTests`. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
 - Add a test for using Stores as a context managers in `StoreTests`. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
-- Implemented `LogingStore.open()`. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
+- Implemented `LoggingStore.open()`. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
 - `LoggingStore` is now a generic class. ([#2693](https://github.com/zarr-developers/zarr-python/issues/2693))
 - Change StoreTest's `test_store_repr`, `test_store_supports_writes`,
   `test_store_supports_partial_writes`, and `test_store_supports_listing`

src/zarr/storage/_zip.py

@@ -245,6 +245,8 @@ async def delete(self, key: str) -> None:
 
     async def exists(self, key: str) -> bool:
         # docstring inherited
+        if not self._is_open:
+            self._sync_open()
         with self._lock:
             try:
                 self._zf.getinfo(key)
@@ -255,6 +257,8 @@ async def exists(self, key: str) -> bool:
 
     async def list(self) -> AsyncIterator[str]:
         # docstring inherited
+        if not self._is_open:
+            self._sync_open()
         with self._lock:
             for key in self._zf.namelist():
                 yield key
@@ -267,6 +271,8 @@ async def list_prefix(self, prefix: str) -> AsyncIterator[str]:
 
     async def list_dir(self, prefix: str) -> AsyncIterator[str]:
         # docstring inherited
+        if not self._is_open:
+            self._sync_open()
         prefix = prefix.rstrip("/")
 
         keys = self._zf.namelist()

tests/test_array.py

@@ -209,19 +209,19 @@ def test_array_name_properties_with_group(
 
 @pytest.mark.filterwarnings("ignore::zarr.core.dtype.common.UnstableSpecificationWarning")
 @pytest.mark.parametrize("store", ["memory"], indirect=True)
-@pytest.mark.parametrize("specifiy_fill_value", [True, False])
+@pytest.mark.parametrize("specify_fill_value", [True, False])
 @pytest.mark.parametrize(
     "zdtype", zdtype_examples, ids=tuple(str(type(v)) for v in zdtype_examples)
 )
 def test_array_fill_value_default(
-    store: MemoryStore, specifiy_fill_value: bool, zdtype: ZDType[Any, Any]
+    store: MemoryStore, specify_fill_value: bool, zdtype: ZDType[Any, Any]
 ) -> None:
     """
     Test that creating an array with the fill_value parameter set to None, or unspecified,
     results in the expected fill_value attribute of the array, i.e. the default value of the dtype
     """
     shape = (10,)
-    if specifiy_fill_value:
+    if specify_fill_value:
         arr = zarr.create_array(
             store=store,
             shape=shape,

tests/test_store/test_zip.py

@@ -139,6 +139,31 @@ def test_externally_zipped_store(self, tmp_path: Path) -> None:
         assert isinstance(group := zipped["foo"], Group)
         assert list(group.keys()) == list(group.keys())
 
+    async def test_list_without_explicit_open(self, tmp_path: Path) -> None:
+        # ZipStore.list(), list_dir(), and exists() should auto-open
+        # the zip file just like _get() and _set() do.
+        zip_path = tmp_path / "data.zip"
+        zarr_path = tmp_path / "foo.zarr"
+        root = zarr.open_group(store=zarr_path, mode="w")
+        root["x"] = np.array([1, 2, 3])
+        shutil.make_archive(str(zarr_path), "zip", zarr_path)
+        shutil.move(str(zarr_path) + ".zip", zip_path)
+
+        store = ZipStore(zip_path, mode="r")
+        assert not store._is_open
+
+        keys = [k async for k in store.list()]
+        assert len(keys) > 0
+
+        store2 = ZipStore(zip_path, mode="r")
+        assert not store2._is_open
+        assert await store2.exists(keys[0])
+
+        store3 = ZipStore(zip_path, mode="r")
+        assert not store3._is_open
+        dir_keys = [k async for k in store3.list_dir("")]
+        assert len(dir_keys) > 0
+
     async def test_move(self, tmp_path: Path) -> None:
         origin = tmp_path / "origin.zip"
         destination = tmp_path / "some_folder" / "destination.zip"