Merge pull request #445 from jakirkham/req_tifffile

Require tifffile
nanshe-org · Apr 6, 2017 · a87f34b · a87f34b
2 parents bd51140 + 570f2ad
commit a87f34b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/nanshe/io/xtiff.py b/nanshe/io/xtiff.py
@@ -37,12 +37,7 @@
 from nanshe.util import iters, xglob, prof, xnumpy
 from nanshe.io import hdf5
 
-try:
-    import tifffile
-except ImportError:
-    # scikit-image is bundled with tifffile so use it.
-    from skimage.external import tifffile
-
+import tifffile
 
 from past.builtins import unicode
 

diff --git a/setup.py b/setup.py
@@ -65,6 +65,7 @@ def run_tests(self):
         "xnumpy",
         "scikit-image",
         "scikit-learn",
+        "tifffile",
         "yail",
         "mahotas",
         "vigra",