large-image-source-multi 1.26.3.dev44__tar.gz → 1.26.3.dev46__tar.gz

{large-image-source-multi-1.26.3.dev44/large_image_source_multi.egg-info → large-image-source-multi-1.26.3.dev46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.26.3.dev44
+Version: 1.26.3.dev46
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -10,14 +10,13 @@ Keywords: large_image,tile source
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.6
+Provides-Extra: all
 Provides-Extra: girder
 License-File: LICENSE
 

{large-image-source-multi-1.26.3.dev44 → large-image-source-multi-1.26.3.dev46}/large_image_source_multi/__init__.py

@@ -970,7 +970,6 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         x = y = 0
         # If there is no transform or the diagonals are positive and there is
         #   no sheer, use getRegion with an appropriate size (be wary of edges)
-        # TODO: when affine is generalized, only use this if scale is 1
         if (transform is None or
                 transform[0][0] > 0 and transform[0][1] == 0 and
                 transform[1][0] == 0 and transform[1][1] > 0):
@@ -1006,10 +1005,16 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             sourceTile, _ = ts.getRegion(
                 region=region, output=output, frame=sourceEntry.get('frame', 0),
                 format=TILE_FORMAT_NUMPY)
-        # Otherwise, get an area twice as big as needed and use
-        #  scipy.ndimage.affine_transform to transform it
+        # Otherwise, determine where the target tile's corners are located on
+        # the source; fetch that so that we have at least sqrt(2) more
+        # resolution, then use scikit-image warp to transform it.  scikit-image
+        # does a better job than scipy.ndimage.affine_transform.
         else:
-            # TODO
+            # try:
+            #     import skimge.transform
+            # except ImportError:
+            #     msg = 'scikit-image is required for affine transforms.'
+            #     raise TileSourceError(msg)
             msg = 'Not implemented'
             raise TileSourceError(msg)
         # Crop

{large-image-source-multi-1.26.3.dev44 → large-image-source-multi-1.26.3.dev46/large_image_source_multi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.26.3.dev44
+Version: 1.26.3.dev46
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -10,14 +10,13 @@ Keywords: large_image,tile source
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.6
+Provides-Extra: all
 Provides-Extra: girder
 License-File: LICENSE
 

large-image-source-multi-1.26.3.dev46/large_image_source_multi.egg-info/requires.txt

@@ -0,0 +1,9 @@
+jsonschema
+large-image>=1.26.3.dev46
+pyyaml
+
+[all]
+scikit-image
+
+[girder]
+girder-large-image>=1.26.3.dev46

{large-image-source-multi-1.26.3.dev44 → large-image-source-multi-1.26.3.dev46}/setup.py

@@ -44,8 +44,6 @@ setup(
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -56,10 +54,11 @@ setup(
         'jsonschema',
         f'large-image{limit_version}',
         'pyyaml',
-        'scipy',
-        'importlib-metadata<5 ; python_version < "3.8"',
     ],
     extras_require={
+        'all': [
+            'scikit-image',
+        ],
         'girder': f'girder-large-image{limit_version}',
     },
     keywords='large_image, tile source',

large-image-source-multi-1.26.3.dev44/large_image_source_multi.egg-info/requires.txt

@@ -1,10 +0,0 @@
-jsonschema
-large-image>=1.26.3.dev44
-pyyaml
-scipy
-
-[:python_version < "3.8"]
-importlib-metadata<5
-
-[girder]
-girder-large-image>=1.26.3.dev44