large-image-source-tiff 1.30.6.dev35__tar.gz → 1.30.6.dev42__tar.gz

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.30.6.dev35
+Version: 1.30.6.dev42
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.6.dev35
+Requires-Dist: large-image>=1.30.6.dev42
 Requires-Dist: pylibtiff
 Requires-Dist: tifftools>=1.2.0
 Provides-Extra: all
 Requires-Dist: pylibjpeg-openjpeg; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.6.dev42; extra == "girder"
 
 A TIFF tilesource for large_image.
 

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/large_image_source_tiff/__init__.py

@@ -141,7 +141,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 continue
             # If a layer is a multiple of the tile size, the number of tiles
             # should be a power of two rounded up from the primary.
-            if (not (td.imageWidth % td.tileWidth) and not (td.imageHeight % td.tileHeight)):
+            if not (td.imageWidth % td.tileWidth) and not (td.imageHeight % td.tileHeight):
                 htw = highest.imageWidth // td.tileWidth
                 hth = highest.imageHeight // td.tileHeight
                 ttw = td.imageWidth // td.tileWidth
@@ -695,8 +695,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 except Exception:
                     if sparseFallback:
                         raise IOTiffError('Missing z level %d' % z)
-                    else:
-                        raise
+                    raise
             else:
                 tile = dir.getTile(x, y, asarray=numpyAllowed == 'always')
                 format = 'JPEG'

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/large_image_source_tiff/tiff_reader.py

@@ -447,12 +447,11 @@ class TiledTiffDirectory:
 
         if tileByteCountsLibtiffType == libtiff_ctypes.TIFFDataType.TIFF_LONG8:
             return ctypes.c_uint64
-        elif tileByteCountsLibtiffType == \
+        if tileByteCountsLibtiffType == \
                 libtiff_ctypes.TIFFDataType.TIFF_SHORT:
             return ctypes.c_uint16
-        else:
-            raise IOTiffError(
-                'Invalid type for TIFFTAG_TILEBYTECOUNTS: %s' % tileByteCountsLibtiffType)
+        raise IOTiffError(
+            'Invalid type for TIFFTAG_TILEBYTECOUNTS: %s' % tileByteCountsLibtiffType)
 
     def _getJpegFrameSize(self, tileNum):
         """
@@ -529,10 +528,10 @@ class TiledTiffDirectory:
         if bytesRead == -1:
             msg = 'Failed to read raw tile'
             raise IOTiffError(msg)
-        elif bytesRead < rawTileSize:
+        if bytesRead < rawTileSize:
             msg = 'Buffer underflow when reading tile'
             raise IOTiffError(msg)
-        elif bytesRead > rawTileSize:
+        if bytesRead > rawTileSize:
             # It's unlikely that this will ever occur, but incomplete reads will
             # be checked for by looking for the JPEG end marker
             msg = 'Buffer overflow when reading tile'
@@ -838,7 +837,7 @@ class TiledTiffDirectory:
         self._embeddedImages = {}
 
         if not meta:
-            return
+            return None
         if not isinstance(meta, str):
             meta = meta.decode(errors='ignore')
         try:
@@ -860,7 +859,7 @@ class TiledTiffDirectory:
                         meta.split('|MPP = ', 1)[1].split('|')[0].strip()) * 0.001
                 except Exception:
                     pass
-            return
+            return None
         try:
             image = xml.find(
                 ".//DataObject[@ObjectType='DPScannedImage']")

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/large_image_source_tiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.30.6.dev35
+Version: 1.30.6.dev42
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.6.dev35
+Requires-Dist: large-image>=1.30.6.dev42
 Requires-Dist: pylibtiff
 Requires-Dist: tifftools>=1.2.0
 Provides-Extra: all
 Requires-Dist: pylibjpeg-openjpeg; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.6.dev42; extra == "girder"
 
 A TIFF tilesource for large_image.
 

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/large_image_source_tiff.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image>=1.30.6.dev35
+large-image>=1.30.6.dev42
 pylibtiff
 tifftools>=1.2.0
 
@@ -6,4 +6,4 @@ tifftools>=1.2.0
 pylibjpeg-openjpeg
 
 [girder]
-girder-large-image>=1.30.6.dev35
+girder-large-image>=1.30.6.dev42

{large_image_source_tiff-1.30.6.dev35 → large_image_source_tiff-1.30.6.dev42}/setup.py

@@ -19,8 +19,7 @@ def prerelease_local_scheme(version):
 
     if os.getenv('CIRCLE_BRANCH') in ('master', ):
         return ''
-    else:
-        return get_local_node_and_date(version)
+    return get_local_node_and_date(version)
 
 
 try: