Update for scikit-image>=0.20 (#215)

ashlar/thumbnail.py

@@ -47,9 +47,8 @@ def calculate_image_offset(img1, img2, upsample_factor=1):
         ref,
         test,
         upsample_factor=upsample_factor,
-        normalization=None,
-        return_error=False,
-    )
+        normalization=None
+    )[0]
     return shift
 
 

ashlar/utils.py

@@ -2,6 +2,7 @@
 import itertools
 import warnings
 import skimage
+import skimage.restoration.uft
 import scipy.ndimage
 import numpy as np
 
@@ -35,14 +36,15 @@ def window(img):
 def register(img1, img2, sigma, upsample=10):
     img1w = window(whiten(img1, sigma))
     img2w = window(whiten(img2, sigma))
+
     shift = skimage.registration.phase_cross_correlation(
         img1w,
         img2w,
         upsample_factor=upsample,
-        normalization=None,
-        return_error=False,
-    )
-    # At this point we may have a shift in the wrong quadrant since the FFT
+        normalization=None
+    )[0]
+
+        # At this point we may have a shift in the wrong quadrant since the FFT
     # assumes the signal is periodic. We test all four possibilities and return
     # the shift that gives the highest direct correlation (sum of products).
     shape = np.array(img1.shape)

setup.py

@@ -13,7 +13,7 @@
     'matplotlib>=3.1.2',
     'networkx>=2.4',
     'scipy>=1.4.1',
-    'scikit-image>=0.19.2,<0.20', # The v1.0 API promises breaking changes.
+    'scikit-image>=0.19.2',
     'scikit-learn>=0.21.1',
     'tifffile>=2023.3.15',
     'zarr>=2.11.3',