Skip to content

Commit

Permalink
Use acquire-driver-zarr v0.1.12.
Browse files Browse the repository at this point in the history
  • Loading branch information
aliddell committed Jul 26, 2024
1 parent f3824fe commit e6f85bd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
10 changes: 5 additions & 5 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion drivers.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
20 changes: 11 additions & 9 deletions tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand All @@ -533,6 +533,7 @@ def test_storage_capabilities(
chunking: bool,
sharding: bool,
multiscale: bool,
s3: bool,
):
dm = runtime.device_manager()
p = runtime.get_configuration()
Expand All @@ -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):
Expand Down

0 comments on commit e6f85bd

Please sign in to comment.