From e6f85bd33e8080cca612c5885fc1e96b0c7b5c5d Mon Sep 17 00:00:00 2001
From: Alan Liddell <aliddell@chanzuckerberg.com>
Date: Fri, 26 Jul 2024 13:21:36 -0400
Subject: [PATCH] Use acquire-driver-zarr v0.1.12.

---
 build.rs            | 10 +++++-----
 drivers.json        |  2 +-
 tests/test_basic.py | 20 +++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/build.rs b/build.rs
index ebd3c3e..21d6068 100644
--- a/build.rs
+++ b/build.rs
@@ -59,11 +59,11 @@ fn main() {
     // download and copy driver artifacts
     let drivers_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("drivers");
 
-    // fetch_acquire_driver(
-    //     &drivers_dir,
-    //     "acquire-driver-zarr",
-    //     tags.acquire_driver_zarr.as_str(),
-    // );
+    fetch_acquire_driver(
+        &drivers_dir,
+        "acquire-driver-zarr",
+        tags.acquire_driver_zarr.as_str(),
+    );
     fetch_acquire_driver(
         &drivers_dir,
         "acquire-driver-egrabber",
diff --git a/drivers.json b/drivers.json
index ca069fd..78e4adb 100644
--- a/drivers.json
+++ b/drivers.json
@@ -1,5 +1,5 @@
 {
-  "acquire-driver-zarr": "0.1.11",
+  "acquire-driver-zarr": "0.1.12",
   "acquire-driver-egrabber": "0.1.5",
   "acquire-driver-hdcam": "0.1.9",
   "acquire-driver-spinnaker": "0.1.1",
diff --git a/tests/test_basic.py b/tests/test_basic.py
index 4a25d22..9da1e26 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -4,7 +4,7 @@
 import time
 from datetime import timedelta
 from time import sleep
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 import acquire
 from acquire import DeviceKind, DeviceState, Runtime, Trigger, PropertyType
@@ -380,7 +380,7 @@ def test_abort(runtime: Runtime):
 
 def wait_for_data(
     runtime: Runtime, stream_id: int = 0, timeout: Optional[timedelta] = None
-) -> acquire.AvailableData:
+) -> Tuple[int, int]:
     # None is used as a missing sentinel value, not to indicate no timeout.
     if timeout is None:
         timeout = timedelta(seconds=5)
@@ -517,14 +517,14 @@ def test_simulated_camera_capabilities(
 
 
 @pytest.mark.parametrize(
-    ("descriptor", "chunking", "sharding", "multiscale"),
+    ("descriptor", "chunking", "sharding", "multiscale", "s3"),
     [
-        ("raw", False, False, False),
-        ("trash", False, False, False),
-        ("tiff", False, False, False),
-        ("tiff-json", False, False, False),
-        ("zarr", True, False, True),
-        ("zarrv3", True, True, False),
+        ("raw", False, False, False, False),
+        ("trash", False, False, False, False),
+        ("tiff", False, False, False, False),
+        ("tiff-json", False, False, False, False),
+        ("zarr", True, False, True, True),
+        ("zarrv3", True, True, True, True),
     ],
 )
 def test_storage_capabilities(
@@ -533,6 +533,7 @@ def test_storage_capabilities(
     chunking: bool,
     sharding: bool,
     multiscale: bool,
+    s3: bool,
 ):
     dm = runtime.device_manager()
     p = runtime.get_configuration()
@@ -551,6 +552,7 @@ def test_storage_capabilities(
     assert storage.chunking_is_supported == chunking
     assert storage.sharding_is_supported == sharding
     assert storage.multiscale_is_supported == multiscale
+    assert storage.s3_is_supported == s3
 
 
 def test_invalidated_frame(runtime: Runtime):