diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 257ab279..28dcc861 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ Release 2.0.6 * `scikit-ued` is being re-licensed from the MIT license to the GPLv3 license. * The `fast` argument to `skued.align` and `skued.ialign` has been deprecated. Its value has no effect anymore. * Official support for Python 3.9. +* Removed explicit requirement for the `tifffile` package. Release 2.0.5 ------------- diff --git a/appveyor.yml b/appveyor.yml index ad14ac2c..8b56080d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ environment: # to the matrix section. TEST_CMD: "python -m unittest discover --verbose" CONDA_CHANNELS: "default conda-forge" - CONDA_DEPENDENCIES: "numpy scipy cython scikit-image crystals tifffile pywavelets npstreams pyyaml" + CONDA_DEPENDENCIES: "numpy scipy cython scikit-image crystals pywavelets npstreams pyyaml" PIP_DEPENDENCIES: "" matrix: diff --git a/requirements.txt b/requirements.txt index 181ba883..adee2fe0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,5 @@ numpy >= 1.15, < 2 pywavelets >= 1.0.0 scikit-image >= 0.17, <1 scipy >= 1.0.0 -tifffile >= 0.13 pyyaml >= 3.1 matplotlib >= 3.0.0, <4 \ No newline at end of file diff --git a/skued/io/io.py b/skued/io/io.py index 51feb0ab..42aa71b8 100644 --- a/skued/io/io.py +++ b/skued/io/io.py @@ -2,8 +2,6 @@ from pathlib import Path -import tifffile - from .dm import dmread from .merlin import mibread @@ -40,9 +38,7 @@ def diffread(fname): """ fname = str(fname) # In case of pathlib.Path - if fname.endswith(("tiff", "tif")): - return tifffile.imread(fname) - elif fname.endswith(".mib"): + if fname.endswith(".mib"): return mibread(fname) elif fname.endswith((".dm3", ".dm4")): return dmread(fname)