diff --git a/.gitignore b/.gitignore index e411cc0..374bf10 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ pip-selfcheck.json # Unit test / coverage reports htmlcov/ .tox/ -.coverage +.coverage* .cache nosetests.xml coverage.xml diff --git a/Cargo.toml b/Cargo.toml index 27b9a01..5bac658 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "acquire-imaging" authors = ["Nathan Clack "] -version = "0.4.0-rc1" +version = "0.4.0-rc2" edition = "2021" [lib] diff --git a/acquire-common b/acquire-common index 7afe044..8e3e995 160000 --- a/acquire-common +++ b/acquire-common @@ -1 +1 @@ -Subproject commit 7afe044c0bb91c24bf8f397205b42f47ccade05a +Subproject commit 8e3e9957c6f5d66753dc0a312c3a729e98f8e737 diff --git a/drivers.json b/drivers.json index 78e4adb..35dd763 100644 --- a/drivers.json +++ b/drivers.json @@ -1,5 +1,5 @@ { - "acquire-driver-zarr": "0.1.12", + "acquire-driver-zarr": "0.1.13", "acquire-driver-egrabber": "0.1.5", "acquire-driver-hdcam": "0.1.9", "acquire-driver-spinnaker": "0.1.1", diff --git a/tests/test_zarr.py b/tests/test_zarr.py index 517c6f3..7e8bbd7 100644 --- a/tests/test_zarr.py +++ b/tests/test_zarr.py @@ -5,7 +5,6 @@ from typing import Optional import dotenv -import numpy as np import pytest import s3fs import zarr @@ -13,7 +12,6 @@ from numcodecs import blosc as blosc from ome_zarr.io import parse_url from ome_zarr.reader import Reader -from skimage.transform import downscale_local_mean import acquire from acquire import Runtime, DeviceKind @@ -420,15 +418,7 @@ def test_write_zarr_multiscale( data = [ da.from_zarr(uri, component=str(i)) for i in range(len(zgroup.data)) ] - assert len(data) == 3 - - image = data[0][0, :, :].compute() # convert dask array to numpy array - - for d in data: - assert ( - np.linalg.norm(image - d[0, :, :].compute()) == 0 - ) # validate against the same method from scikit-image - image = downscale_local_mean(image, (2, 2)).astype(np.uint8) + assert len(data) == 3 # 3 layers @pytest.mark.parametrize(