Merge pull request #596 from girder/nd2-update

Handle a change in exceptions in the nd2reader library.
girder · Apr 26, 2021 · eeddfa5 · eeddfa5
2 parents 61c91a6 + 22274ae
commit eeddfa5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sources/nd2/large_image_source_nd2/__init__.py b/sources/nd2/large_image_source_nd2/__init__.py
@@ -81,7 +81,8 @@ def __init__(self, path, **kwargs):
             self._nd2 = nd2reader.ND2Reader(self._largeImagePath)
         except (UnicodeDecodeError,
                 nd2reader.exceptions.InvalidVersionError,
-                nd2reader.exceptions.EmptyFileError):
+                nd2reader.exceptions.EmptyFileError,
+                nd2reader.exceptions.InvalidFileType):
             raise TileSourceException('File cannot be opened via nd2reader.')
         self._logger = config.getConfig('logger')
         self._tileLock = threading.RLock()

diff --git a/sources/nd2/setup.py b/sources/nd2/setup.py
@@ -40,7 +40,7 @@ def prerelease_local_scheme(version):
     ],
     install_requires=[
         'large-image>=1.0.0',
-        'nd2reader>=3.2',
+        'nd2reader>=3.3',
     ],
     extras_require={
         'girder': 'girder-large-image>=1.0.0',