From 22274ae207d5d14073ebd96d84b1e543cdf95970 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Mon, 26 Apr 2021 09:33:14 -0400 Subject: [PATCH] Handle a change in exceptions in the nd2reader library. --- sources/nd2/large_image_source_nd2/__init__.py | 3 ++- sources/nd2/setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/nd2/large_image_source_nd2/__init__.py b/sources/nd2/large_image_source_nd2/__init__.py index 5a7dbb732..26de9a32e 100644 --- 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 index 128e80d76..f8deecf92 100644 --- 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',