large-image-source-ometiff 1.23.2.dev18__tar.gz → 1.23.3__tar.gz

{large-image-source-ometiff-1.23.2.dev18 → large-image-source-ometiff-1.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-ometiff
-Version: 1.23.2.dev18
+Version: 1.23.3
 Summary: An OMETiff tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-ometiff-1.23.2.dev18 → large-image-source-ometiff-1.23.3}/large_image_source_ometiff/__init__.py

@@ -19,7 +19,7 @@ import math
 import os
 from collections import OrderedDict
 
-import numpy
+import numpy as np
 import PIL.Image
 from large_image_source_tiff import TiffFileTileSource
 from large_image_source_tiff.exceptions import InvalidOperationTiffError, IOTiffError, TiffError
@@ -107,10 +107,12 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
         except TiffError:
             if not os.path.isfile(self._largeImagePath):
                 raise TileSourceFileNotFoundError(self._largeImagePath) from None
-            raise TileSourceError('Not a recognized OME Tiff')
+            msg = 'Not a recognized OME Tiff'
+            raise TileSourceError(msg)
         info = getattr(base, '_description_record', None)
         if not info or not info.get('OME'):
-            raise TileSourceError('Not an OME Tiff')
+            msg = 'Not an OME Tiff'
+            raise TileSourceError(msg)
         self._omeinfo = info['OME']
         self._checkForOMEZLoop(self._largeImagePath)
         self._parseOMEInfo()
@@ -137,8 +139,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
             _maxChunk = min(base.imageWidth, base.tileWidth * self._skippedLevels ** 2) * \
                 min(base.imageHeight, base.tileHeight * self._skippedLevels ** 2)
             if _maxChunk > self._maxUntiledChunk:
-                raise TileSourceError(
-                    'Untiled image is too large to access with the OME Tiff source')
+                msg = 'Untiled image is too large to access with the OME Tiff source'
+                raise TileSourceError(msg)
         self.tileWidth = base.tileWidth
         self.tileHeight = base.tileHeight
         self.levels = len(self._tiffDirectories)
@@ -240,15 +242,17 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
                 self._omebase['TiffData'] = [self._omebase['TiffData']]
             if len({entry.get('UUID', {}).get('FileName', '')
                     for entry in self._omebase['TiffData']}) > 1:
-                raise TileSourceError('OME Tiff references multiple files')
+                msg = 'OME Tiff references multiple files'
+                raise TileSourceError(msg)
             if (len(self._omebase['TiffData']) != int(self._omebase['SizeC']) *
                     int(self._omebase['SizeT']) * int(self._omebase['SizeZ']) or
                     len(self._omebase['TiffData']) != len(
                         self._omebase.get('Plane', self._omebase['TiffData']))):
-                raise TileSourceError(
-                    'OME Tiff contains frames that contain multiple planes')
+                msg = 'OME Tiff contains frames that contain multiple planes'
+                raise TileSourceError(msg)
         except (KeyError, ValueError, IndexError, TypeError):
-            raise TileSourceError('OME Tiff does not contain an expected record')
+            msg = 'OME Tiff does not contain an expected record'
+            raise TileSourceError(msg)
 
     def getMetadata(self):
         """
@@ -329,7 +333,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
                 **kwargs)
         frame = self._getFrame(**kwargs)
         if frame < 0 or frame >= len(self._omebase['TiffData']):
-            raise TileSourceError('Frame does not exist')
+            msg = 'Frame does not exist'
+            raise TileSourceError(msg)
         subdir = None
         if self._omeLevels[z] is not None:
             dirnum = int(self._omeLevels[z]['TiffData'][frame].get('IFD', frame))
@@ -353,7 +358,7 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
             format = 'JPEG'
             if isinstance(tile, PIL.Image.Image):
                 format = TILE_FORMAT_PIL
-            if isinstance(tile, numpy.ndarray):
+            if isinstance(tile, np.ndarray):
                 format = TILE_FORMAT_NUMPY
             return self._outputTile(tile, format, x, y, z, pilImageAllowed,
                                     numpyAllowed, **kwargs)

{large-image-source-ometiff-1.23.2.dev18 → large-image-source-ometiff-1.23.3}/large_image_source_ometiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-ometiff
-Version: 1.23.2.dev18
+Version: 1.23.3
 Summary: An OMETiff tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-ometiff-1.23.3/large_image_source_ometiff.egg-info/requires.txt

@@ -0,0 +1,8 @@
+large-image>=1.23.3
+large-image-source-tiff>=1.23.3
+
+[:python_version < "3.8"]
+importlib-metadata<5
+
+[girder]
+girder-large-image>=1.23.3

{large-image-source-ometiff-1.23.2.dev18 → large-image-source-ometiff-1.23.3}/setup.py

@@ -55,7 +55,7 @@ setup(
     install_requires=[
         f'large-image{limit_version}',
         f'large-image-source-tiff{limit_version}',
-        'importlib-metadata<5 ; python_version < "3.8"'
+        'importlib-metadata<5 ; python_version < "3.8"',
     ],
     extras_require={
         'girder': f'girder-large-image{limit_version}',
@@ -66,10 +66,10 @@ setup(
     python_requires='>=3.6',
     entry_points={
         'large_image.source': [
-            'ometiff = large_image_source_ometiff:OMETiffFileTileSource'
+            'ometiff = large_image_source_ometiff:OMETiffFileTileSource',
         ],
         'girder_large_image.source': [
-            'ometiff = large_image_source_ometiff.girder_source:OMETiffGirderTileSource'
-        ]
+            'ometiff = large_image_source_ometiff.girder_source:OMETiffGirderTileSource',
+        ],
     },
 )

large-image-source-ometiff-1.23.2.dev18/large_image_source_ometiff.egg-info/requires.txt

@@ -1,8 +0,0 @@
-large-image>=1.23.2.dev18
-large-image-source-tiff>=1.23.2.dev18
-
-[:python_version < "3.8"]
-importlib-metadata<5
-
-[girder]
-girder-large-image>=1.23.2.dev18