Merge pull request #1411 from girder/cleanup-old-version

Clean up some old python version code.

requirements-dev.txt

@@ -6,7 +6,7 @@ girder-jobs>=3.0.3
 -e sources/dicom
 -e sources/dummy
 -e sources/gdal
--e sources/multi
+-e sources/multi[all]
 -e sources/nd2
 -e sources/openjpeg
 -e sources/openslide

requirements-test-core.txt

@@ -4,7 +4,7 @@ sources/deepzoom
 sources/dicom
 sources/dummy
 sources/gdal
-sources/multi
+sources/multi[all]
 sources/nd2
 sources/openjpeg
 sources/openslide

requirements-test.txt

@@ -6,7 +6,7 @@ sources/deepzoom
 sources/dicom
 sources/dummy
 sources/gdal
-sources/multi
+sources/multi[all]
 sources/nd2
 sources/openjpeg
 sources/openslide

setup.py

@@ -67,6 +67,7 @@ def prerelease_local_scheme(version):
 extraReqs.update(sources)
 extraReqs['sources'] = list(set(itertools.chain.from_iterable(sources.values())))
 extraReqs['all'] = list(set(itertools.chain.from_iterable(extraReqs.values())) | {
+    f'large-image-source-multi[all]{limit_version}',
     f'large-image-source-pil[all]{limit_version}',
     f'large-image-source-rasterio[all]{limit_version}',
 })

sources/multi/large_image_source_multi/__init__.py

@@ -970,7 +970,6 @@ def _addSourceToTile(self, tile, sourceEntry, corners, scale):
         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 @@ def _addSourceToTile(self, tile, sourceEntry, corners, scale):
             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

sources/multi/setup.py

@@ -44,8 +44,6 @@ def prerelease_local_scheme(version):
         '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 @@ def prerelease_local_scheme(version):
         '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',

sources/zarr/setup.py

@@ -44,7 +44,6 @@ def prerelease_local_scheme(version):
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -53,9 +52,7 @@ def prerelease_local_scheme(version):
     ],
     install_requires=[
         f'large-image{limit_version}',
-        'zarr ; python_version >= "3.8"',
-        'zarr<2.11 ; python_version < "3.8"',
-        'importlib-metadata<5 ; python_version < "3.8"',
+        'zarr',
     ],
     extras_require={
         'girder': f'girder-large-image{limit_version}',