diff --git a/Cargo.toml b/Cargo.toml index 16bf190..756c48f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "acquire-imaging" authors = ["Nathan Clack "] -version = "0.2.0" +version = "0.2.1" edition = "2021" [lib] diff --git a/acquire-libs/acquire-core-libs b/acquire-libs/acquire-core-libs index 8bea9c8..60cb52c 160000 --- a/acquire-libs/acquire-core-libs +++ b/acquire-libs/acquire-core-libs @@ -1 +1 @@ -Subproject commit 8bea9c8ab8806d481ae943d3577c9adcede98672 +Subproject commit 60cb52cd3e42a557ade1bd3d57f32308392ab8ec diff --git a/acquire-libs/acquire-video-runtime b/acquire-libs/acquire-video-runtime index 4d21090..83bd825 160000 --- a/acquire-libs/acquire-video-runtime +++ b/acquire-libs/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 4d21090545e05f830735d004484826a7d6bb8399 +Subproject commit 83bd825626e6530895598ee1f78c9cb2230d9b40 diff --git a/drivers.json b/drivers.json index ef63141..45a06dd 100644 --- a/drivers.json +++ b/drivers.json @@ -1,6 +1,6 @@ { "acquire-driver-common": "0.1.5", - "acquire-driver-zarr": "0.1.6", + "acquire-driver-zarr": "0.1.7", "acquire-driver-egrabber": "0.1.4", "acquire-driver-hdcam": "0.1.6", "acquire-driver-spinnaker": "0.1.1" diff --git a/tests/test_basic.py b/tests/test_basic.py index d52145b..8ef4b7d 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -11,16 +11,10 @@ import tifffile -@pytest.fixture(scope="module") -def _runtime(): - runtime = acquire.Runtime() - yield runtime - - +# FIXME (aliddell): this should be module scoped, but the runtime is leaky @pytest.fixture(scope="function") -def runtime(_runtime: Runtime): - yield _runtime - _runtime.set_configuration(acquire.Properties()) +def runtime(): + yield acquire.Runtime() def test_set(): @@ -527,7 +521,6 @@ def test_simulated_camera_capabilities( ) def test_storage_capabilities( runtime: Runtime, - request: pytest.FixtureRequest, descriptor: str, extension: str, chunking: Optional[Dict[str, Any]], @@ -539,20 +532,13 @@ def test_storage_capabilities( p.video[0].camera.identifier = dm.select(DeviceKind.Camera, ".*empty") p.video[0].storage.identifier = dm.select(DeviceKind.Storage, descriptor) - # FIXME (aliddell): hack to get the storage capabilities to be populated - p.video[0].storage.settings.filename = f"{request.node.name}.{extension}" - p.video[0].storage.settings.external_metadata_json = json.dumps( {"hello": "world"} ) # for tiff-json p.video[0].max_frame_count = 1000 runtime.set_configuration(p) - # FIXME (aliddell): hack to get the storage capabilities to be populated - runtime.start() c = runtime.get_capabilities() - # FIXME (aliddell): hack to get the storage capabilities to be populated - runtime.abort() storage = c.video[0].storage chunk_dims_px = storage.chunk_dims_px diff --git a/tests/test_zarr.py b/tests/test_zarr.py index b3cdb5a..6511805 100644 --- a/tests/test_zarr.py +++ b/tests/test_zarr.py @@ -16,16 +16,10 @@ from acquire import Runtime, DeviceKind -@pytest.fixture(scope="module") -def _runtime(): - runtime = acquire.Runtime() - yield runtime - - +# FIXME (aliddell): this should be module scoped, but the runtime is leaky @pytest.fixture(scope="function") -def runtime(_runtime: acquire.Runtime): - yield _runtime - _runtime.set_configuration(acquire.Properties()) +def runtime(): + yield acquire.Runtime() def test_write_external_metadata_to_zarr(