Update zarr imports

Author: dstansby

src/hipct_reg/data.py

@@ -11,8 +11,7 @@
 import numpy as np
 import numpy.typing as npt
 import SimpleITK as sitk
-import zarr.convenience
-import zarr.core
+import zarr
 from hoa_tools.dataset import Dataset, get_dataset
 from hoa_tools.inventory import load_inventory
 
@@ -138,9 +137,9 @@ def download_cube(self) -> None:
                 self.lower_idx[2] : self.upper_idx[2],
             ]
 
-        zarr.convenience.save(self.local_zarr_path, data)
+        zarr.save(self.local_zarr_path, data)
 
-    def get_remote_arr(self) -> zarr.core.Array:
+    def get_remote_arr(self) -> zarr.Array:
         """
         Get remote GCS store for the cube.
         """

src/hipct_reg/tests/conftest.py

@@ -3,7 +3,7 @@
 import pooch
 import pytest
 import SimpleITK as sitk
-import zarr.convenience
+import zarr
 
 DOI = "doi:10.5281/zenodo.10778257"
 
@@ -16,7 +16,7 @@ def overview_image() -> sitk.Image:
         known_hash=None,
         processor=pooch.Unzip(),
     )
-    arr = zarr.convenience.load(Path(file_paths[0]).parent)[:]
+    arr = zarr.load(Path(file_paths[0]).parent)[:]
 
     spacing = 25.08
     image = sitk.GetImageFromArray(arr.T)
@@ -34,7 +34,7 @@ def zoom_image() -> sitk.Image:
         known_hash=None,
         processor=pooch.Unzip(),
     )
-    arr = zarr.convenience.load(Path(file_paths[0]).parent)[:]
+    arr = zarr.load(Path(file_paths[0]).parent)[:]
 
     spacing = 6.05
     image = sitk.GetImageFromArray(arr.T)