large-image-source-ometiff 1.30.6.dev35__tar.gz → 1.30.6.dev38__tar.gz

{large_image_source_ometiff-1.30.6.dev35 → large_image_source_ometiff-1.30.6.dev38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-ometiff
-Version: 1.30.6.dev35
+Version: 1.30.6.dev38
 Summary: An OMETiff tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,10 +19,10 @@ 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-source-tiff>=1.30.6.dev35
+Requires-Dist: large-image>=1.30.6.dev38
+Requires-Dist: large-image-source-tiff>=1.30.6.dev38
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.6.dev38; extra == "girder"
 
 An OMETiff tilesource for large_image.
 

{large_image_source_ometiff-1.30.6.dev35 → large_image_source_ometiff-1.30.6.dev38}/large_image_source_ometiff/__init__.py

@@ -228,8 +228,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
                 except Exception:
                     continue
                 if (dir is not None and
-                        (dir.tileWidth == base.tileWidth or dir.tileWidth == dir.imageWidth) and
-                        (dir.tileHeight == base.tileHeight or dir.tileHeight == dir.imageHeight) and
+                        (dir.tileWidth in {base.tileWidth, dir.imageWidth}) and
+                        (dir.tileHeight in {base.tileHeight, dir.imageHeight}) and
                         abs(dir.imageWidth * scale - base.imageWidth) <= scale and
                         abs(dir.imageHeight * scale - base.imageHeight) <= scale):
                     filled[z] = subdir
@@ -410,8 +410,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
         if subdir:
             scale = int(2 ** subdir)
             if (dir is None or
-                    (dir.tileWidth != self.tileWidth and dir.tileWidth != dir.imageWidth) or
-                    (dir.tileHeight != self.tileHeight and dir.tileHeight != dir.imageHeight) or
+                    (dir.tileWidth not in {self.tileWidth, dir.imageWidth}) or
+                    (dir.tileHeight not in {self.tileHeight, dir.imageHeight}) or
                     abs(dir.imageWidth * scale - self.sizeX) > scale or
                     abs(dir.imageHeight * scale - self.sizeY) > scale):
                 return super().getTile(

{large_image_source_ometiff-1.30.6.dev35 → large_image_source_ometiff-1.30.6.dev38}/large_image_source_ometiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-ometiff
-Version: 1.30.6.dev35
+Version: 1.30.6.dev38
 Summary: An OMETiff tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,10 +19,10 @@ 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-source-tiff>=1.30.6.dev35
+Requires-Dist: large-image>=1.30.6.dev38
+Requires-Dist: large-image-source-tiff>=1.30.6.dev38
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.6.dev38; extra == "girder"
 
 An OMETiff tilesource for large_image.
 

large_image_source_ometiff-1.30.6.dev38/large_image_source_ometiff.egg-info/requires.txt

@@ -0,0 +1,5 @@
+large-image>=1.30.6.dev38
+large-image-source-tiff>=1.30.6.dev38
+
+[girder]
+girder-large-image>=1.30.6.dev38

{large_image_source_ometiff-1.30.6.dev35 → large_image_source_ometiff-1.30.6.dev38}/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:

large_image_source_ometiff-1.30.6.dev35/large_image_source_ometiff.egg-info/requires.txt

@@ -1,5 +0,0 @@
-large-image>=1.30.6.dev35
-large-image-source-tiff>=1.30.6.dev35
-
-[girder]
-girder-large-image>=1.30.6.dev35