version skimage future warnings

Author: gletort

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "epicure"
-version = "1.5.1"
+version = "1.5.2"
 description = "Napari plugin to manually correct epithelia segmentation in movies"
 license.file = "LICENSE"
 readme = "README.md"

src/epicure/Utils.py

@@ -14,7 +14,7 @@
 from napari.utils.translations import trans # type: ignore
 from napari.utils.notifications import show_info # type: ignore
 from napari.utils import notifications as nt # type: ignore
-from skimage.morphology import skeletonize, binary_dilation, disk, binary_closing 
+from skimage.morphology import skeletonize, disk, binary_closing 
 from scipy.ndimage import center_of_mass, find_objects
 from scipy.ndimage import label as ndlabel
 from scipy.ndimage import binary_opening as ndbinary_opening
@@ -36,6 +36,11 @@
 except:
     from skimage.future.graph import RAG  ## older version of scikit-image
 
+try:
+    from skimage.morphology import binary_dilation
+except:
+    from skimage.morphology import dilation as binary_dilation
+
 def show_info(message):
     """ Display info in napari """
     nt.show_info(message)
@@ -202,6 +207,8 @@ def setOverlayText(viewer, text, size=10 ):
     viewer.text_overlay.text = trans._(text)
     viewer.text_overlay.position = "top_left"
     viewer.text_overlay.visible = True
+    if version_napari_above( "0.6.5" ):
+        size = size - 2
     viewer.text_overlay.font_size = size
     viewer.text_overlay.color = "white"
     viewer.text_overlay.opacity = 1

src/epicure/outputing.py

@@ -8,7 +8,6 @@
 import pandas as pand
 import numpy as np
 import roifile
-from skimage.morphology import binary_erosion, disk, binary_dilation
 from skimage.measure import label
 import os, time
 import napari
@@ -25,6 +24,12 @@
 from qtpy.QtWidgets import QAbstractItemView as aiv
 from random import sample
 from joblib import Parallel, delayed
+
+from skimage.morphology import disk
+try:
+    from skimage.morphology import binary_erosion
+except:
+    from skimage.morphology import erosion as binary_erosion 
 
 
 class Outputing(QWidget):