large-image-converter 1.29.5.dev10__tar.gz → 1.33.4.dev39__tar.gz

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/PKG-INFO

@@ -1,23 +1,23 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: large-image-converter
-Version: 1.29.5.dev10
+Version: 1.33.4.dev39
 Summary: Converter for Large Image.
 Author: Kitware Inc
 Author-email: kitware@kitware.com
-License: Apache Software License 2.0
+License: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Topic :: Scientific/Engineering
 Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python :: 3
-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.8
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image-source-tiff>=1.29.5.dev10
+Requires-Dist: large-image-source-tiff>=1.33.4.dev39
 Requires-Dist: numpy
 Requires-Dist: psutil
 Requires-Dist: pyvips
@@ -27,16 +27,27 @@ Requires-Dist: glymur; extra == "jp2k"
 Provides-Extra: geospatial
 Requires-Dist: gdal; extra == "geospatial"
 Provides-Extra: sources
-Requires-Dist: large-image[sources]>=1.29.5.dev10; extra == "sources"
+Requires-Dist: large-image[sources]>=1.33.4.dev39; extra == "sources"
 Provides-Extra: stats
 Requires-Dist: packaging; extra == "stats"
 Requires-Dist: scikit-image; extra == "stats"
 Provides-Extra: all
 Requires-Dist: glymur; extra == "all"
 Requires-Dist: gdal; extra == "all"
-Requires-Dist: large-image[sources]>=1.29.5.dev10; extra == "all"
+Requires-Dist: large-image[sources]>=1.33.4.dev39; extra == "all"
 Requires-Dist: packaging; extra == "all"
 Requires-Dist: scikit-image; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 *********************
 Large Image Converter

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/large_image_converter/__init__.py

@@ -80,7 +80,7 @@ def _data_from_large_image(path, outputPath, **kwargs):
         try:
             ts = large_image.open(path, noCache=True)
         except Exception:
-            return
+            return None
     else:
         import urllib.parse
 
@@ -109,7 +109,7 @@ def _data_from_large_image(path, outputPath, **kwargs):
         _pool_add(tasks, (pool.submit(
             _convert_via_vips, img, savePath, outputPath, mime=mime, forTiled=False), ))
         results['images'][key] = savePath
-    _drain_pool(pool, tasks)
+    _drain_pool(pool, tasks, 'associated images')
     return results
 
 
@@ -218,7 +218,7 @@ def _generate_multiframe_tiff(inputPath, outputPath, tempPath, lidata, **kwargs)
                 _pool_add(tasks, (pool.submit(
                     _convert_via_vips, subInputPath, savePath, tempPath, False), ))
                 extraImages[key] = savePath
-    _drain_pool(pool, tasks)
+    _drain_pool(pool, tasks, 'subpage')
     _output_tiff(outputList, outputPath, tempPath, lidata, extraImages, **kwargs)
 
 
@@ -249,7 +249,7 @@ def _generate_tiff(inputPath, outputPath, tempPath, lidata, **kwargs):
 
 
 def _convert_via_vips(inputPathOrBuffer, outputPath, tempPath, forTiled=True,
-                      status=None, **kwargs):
+                      status=None, preferredVipsCast=None, **kwargs):
     """
     Convert a file, buffer, or vips image to a tiff file.  This is equivalent
     to a vips command line of
@@ -263,6 +263,7 @@ def _convert_via_vips(inputPathOrBuffer, outputPath, tempPath, forTiled=True,
         also stores files in TMPDIR
     :param forTiled: True if the output should be tiled, false if not.
     :param status: an optional additional string to add to log messages.
+    :param preferredVipsCast: vips scaling parameters to use in a cast.
     :param kwargs: addition arguments that get passed to _vipsParameters
         and _convert_to_jp2k.
     """
@@ -285,7 +286,7 @@ def _convert_via_vips(inputPathOrBuffer, outputPath, tempPath, forTiled=True,
     adjusted = format_hook('modify_vips_image_before_output', image, convertParams, **kwargs)
     if adjusted is False:
         return
-    elif adjusted:
+    if adjusted:
         image = adjusted
     if (convertParams['compression'] not in {'jpeg'} or
             image.interpretation != pyvips.Interpretation.SCRGB):
@@ -294,7 +295,8 @@ def _convert_via_vips(inputPathOrBuffer, outputPath, tempPath, forTiled=True,
         image = _vipsCast(
             image,
             convertParams['compression'] in {'webp', 'jpeg'} or
-            kwargs.get('compression') in {'jp2k'})
+            kwargs.get('compression') in {'jp2k'},
+            preferredVipsCast)
     # TODO: revisit the TMPDIR override; this is not thread safe
     # oldtmpdir = os.environ.get('TMPDIR')
     # os.environ['TMPDIR'] = os.path.dirname(tempPath)
@@ -349,7 +351,7 @@ def _concurrency_to_value(_concurrency=None, **kwargs):
     return max(1, large_image.config.cpu_count(logical=True) + _concurrency)
 
 
-def _get_thread_pool(memoryLimit=None, **kwargs):
+def _get_thread_pool(memoryLimit=None, parentConcurrency=None, numItems=None, **kwargs):
     """
     Allocate a thread pool based on the specific concurrency.
 
@@ -357,12 +359,37 @@ def _get_thread_pool(memoryLimit=None, **kwargs):
         process per memoryLimit bytes of total memory.
     """
     concurrency = _concurrency_to_value(**kwargs)
+    if parentConcurrency and parentConcurrency > 1 and concurrency > 1:
+        concurrency = max(1, int(math.ceil(concurrency / parentConcurrency)))
     if memoryLimit:
+        if parentConcurrency:
+            memoryLimit *= parentConcurrency
         concurrency = min(concurrency, large_image.config.total_memory() // memoryLimit)
+    if numItems and numItems >= 1 and concurrency > numItems:
+        concurrency = numItems
     concurrency = max(1, concurrency)
     return concurrent.futures.ThreadPoolExecutor(max_workers=concurrency)
 
 
+def _pool_log(left, total, label):
+    """
+    Log processing within a pool.
+
+    :param left: units left to process.
+    :param total: total units left to process.
+    :param label: label to log describing what is being processed.
+    """
+    if not hasattr(logger, '_pool_log_starttime'):
+        logger._pool_log_starttime = time.time()
+    if not hasattr(logger, '_pool_log_lastlog'):
+        logger._pool_log_lastlog = time.time()
+    if time.time() - logger._pool_log_lastlog < 10:
+        return
+    elapsed = time.time() - logger._pool_log_starttime
+    logger.debug('%d/%d %s left %4.2fs', left, total, label, elapsed)
+    logger._pool_log_lastlog = time.time()
+
+
 def _pool_add(tasks, newtask):
     """
     Add a new task to a pool, then drain any finished tasks at the start of the
@@ -381,7 +408,7 @@ def _pool_add(tasks, newtask):
         tasks.pop(0)
 
 
-def _drain_pool(pool, tasks):
+def _drain_pool(pool, tasks, label=''):
     """
     Wait for all tasks in a pool to complete, then shutdown the pool.
 
@@ -389,6 +416,8 @@ def _drain_pool(pool, tasks):
     :param tasks: a list containing either lists or tuples, the last element
         of which is a task submitted to the pool.  Altered.
     """
+    numtasks = len(tasks)
+    _pool_log(len(tasks), numtasks, label)
     while len(tasks):
         # This allows better stopping on a SIGTERM
         try:
@@ -396,6 +425,7 @@ def _drain_pool(pool, tasks):
         except concurrent.futures.TimeoutError:
             continue
         tasks.pop(0)
+        _pool_log(len(tasks), numtasks, label)
     pool.shutdown(False)
 
 
@@ -507,7 +537,9 @@ def _convert_large_image_tile(tilelock, strips, tile):
         strips[ty] = strips[ty].insert(vimg, x, 0, expand=True)
 
 
-def _convert_large_image_frame(frame, numFrames, ts, frameOutputPath, tempPath, **kwargs):
+def _convert_large_image_frame(
+        frame, numFrames, ts, frameOutputPath, tempPath, preferredVipsCast=None,
+        parentConcurrency=None, **kwargs):
     """
     Convert a single frame from a large_image source.  This parallelizes tile
     reads.  Once all tiles are converted to a composited vips image, a tiff
@@ -518,23 +550,103 @@ def _convert_large_image_frame(frame, numFrames, ts, frameOutputPath, tempPath,
     :param ts: the open tile source.
     :param frameOutputPath: the destination name for the tiff file.
     :param tempPath: a temporary file in a temporary directory.
+    :param preferredVipsCast: vips scaling parameters to use in a cast.
+    :param parentConcurrency: amount of concurrency used by parent task.
     """
     # The iterator tile size is a balance between memory use and fewer calls
     # and file handles.
     _iterTileSize = 4096
     logger.info('Processing frame %d/%d', frame + 1, numFrames)
     strips = []
-    pool = _get_thread_pool(**kwargs)
+    pool = _get_thread_pool(
+        memoryLimit=FrameMemoryEstimate,
+        # allow multiple tiles even if we are using all the cores, as it
+        # balances I/O and computation
+        parentConcurrency=(parentConcurrency // 2),
+        **kwargs)
     tasks = []
     tilelock = threading.Lock()
     for tile in ts.tileIterator(tile_size=dict(width=_iterTileSize), frame=frame):
         _pool_add(tasks, (pool.submit(_convert_large_image_tile, tilelock, strips, tile), ))
-    _drain_pool(pool, tasks)
+    _drain_pool(pool, tasks, f'tiles from frame {frame + 1}/{numFrames}')
+    minbands = min(strip.bands for strip in strips)
+    maxbands = max(strip.bands for strip in strips)
+    if minbands != maxbands:
+        strips = [strip[:minbands] for strip in strips]
+    # Persist the strips to temp files to build them into single objects;
+    # otherwise vips will use arbitrarily large amounts of memory
+    for sidx in range(len(strips)):
+        _pool_log(len(strips) - sidx, len(strips), 'resolving strips')
+        strip = strips[sidx]
+        vimgTemp = pyvips.Image.new_temp_file('%s.v')
+        strip.write(vimgTemp)
+        strips[sidx] = vimgTemp
     img = strips[0]
     for stripidx in range(1, len(strips)):
         img = img.insert(strips[stripidx], 0, stripidx * _iterTileSize, expand=True)
     _convert_via_vips(
-        img, frameOutputPath, tempPath, status='%d/%d' % (frame + 1, numFrames), **kwargs)
+        img, frameOutputPath, tempPath, status='%d/%d' % (frame + 1, numFrames),
+        preferredVipsCast=preferredVipsCast, **kwargs)
+
+
+def _output_type(lidata, keepFloat=False):  # noqa
+    """
+    Determine how to cast and scale vips data based on actual image contents.
+    """
+    try:
+        intype = np.dtype(lidata['tilesource'].dtype)
+    except Exception:
+        return None
+    if intype == np.uint8 or intype == np.uint16:
+        return None
+    if keepFloat and np.issubdtype(intype, np.floating):
+        if intype == np.float16 or intype == np.float32:
+            return (pyvips.BandFormat.FLOAT, 0, 1)
+        return (pyvips.BandFormat.DOUBLE, 0, 1)
+    logger.debug('Checking data range')
+    minval = maxval = None
+    for frame in range(len(lidata['metadata'].get('frames', [0]))):
+        h = lidata['tilesource'].histogram(
+            onlyMinMax=True, output=dict(maxWidth=2048, maxHeight=2048),
+            resample=0, frame=frame)
+        if 'max' not in h:
+            continue
+        if maxval is None:
+            maxval = max(h['max'].tolist())
+            minval = min(h['min'].tolist())
+        else:
+            maxval = max(maxval, max(h['max'].tolist()))
+            minval = min(minval, min(h['min'].tolist()))
+    lidata['range'] = (minval, maxval)
+    logger.debug('Data range is [%r, %r]', minval, maxval)
+    if minval >= 0 and intype == np.int8:
+        return (pyvips.BandFormat.UCHAR, 0, 1)
+    if minval >= 0 and intype == np.int16:
+        return (pyvips.BandFormat.USHORT, 0, 1)
+    if minval >= 0 and maxval == 0:
+        return (pyvips.BandFormat.UCHAR, 0, 1)
+    if minval >= 0 and maxval <= 2 ** -8:
+        return (pyvips.BandFormat.USHORT, 0,
+                2 ** -(math.ceil(math.log2(maxval)) - 16) - 2 ** -math.ceil(math.log2(maxval)))
+    if minval >= 0 and maxval <= 1:
+        return (pyvips.BandFormat.USHORT, 0, 65535)
+    if minval >= 0 and maxval < 256:
+        return (pyvips.BandFormat.UCHAR, 0, 1)
+    if minval >= 0 and maxval < 65536:
+        return (pyvips.BandFormat.USHORT, 0, 1)
+    if minval >= 0:
+        return (pyvips.BandFormat.USHORT, 0,
+                2 ** -(math.ceil(math.log2(maxval)) - 16) - 2 ** -math.ceil(math.log2(maxval)))
+    if minval >= -2 ** -8 and maxval <= 2 ** -8:
+        return (pyvips.BandFormat.USHORT, 1,
+                2 ** -(math.ceil(math.log2(maxval)) - 15) - 2 ** -math.ceil(math.log2(maxval)))
+    if minval >= -1 and maxval <= 1:
+        return (pyvips.BandFormat.USHORT, 1, 32767)
+    if minval >= -32768 and maxval < 32768:
+        return (pyvips.BandFormat.USHORT, 32768, 1)
+    return (pyvips.BandFormat.USHORT, 0,
+            2 ** -(math.ceil(math.log2(max(-minval, maxval))) - 16) -
+            2 ** -math.ceil(math.log2(max(-minval, maxval))))
 
 
 def _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs):
@@ -549,23 +661,25 @@ def _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs):
         images.
     """
     ts = lidata['tilesource']
+    lidata['_vips_cast'] = _output_type(lidata, kwargs.get('keepFloat', False))
     numFrames = len(lidata['metadata'].get('frames', [0]))
     outputList = []
     tasks = []
-    pool = _get_thread_pool(memoryLimit=FrameMemoryEstimate, **kwargs)
     startFrame = 0
     endFrame = numFrames
     if kwargs.get('onlyFrame') is not None and str(kwargs.get('onlyFrame')):
         startFrame = int(kwargs.get('onlyFrame'))
         endFrame = startFrame + 1
+    pool = _get_thread_pool(memoryLimit=FrameMemoryEstimate,
+                            numItems=endFrame - startFrame, **kwargs)
     for frame in range(startFrame, endFrame):
         frameOutputPath = tempPath + '-%d-%s.tiff' % (
             frame + 1, time.strftime('%Y%m%d-%H%M%S'))
         _pool_add(tasks, (pool.submit(
             _convert_large_image_frame, frame, numFrames, ts, frameOutputPath,
-            tempPath, **kwargs), ))
+            tempPath, lidata['_vips_cast'], pool._max_workers, **kwargs), ))
         outputList.append(frameOutputPath)
-    _drain_pool(pool, tasks)
+    _drain_pool(pool, tasks, 'frames')
     _output_tiff(outputList, outputPath, tempPath, lidata, **kwargs)
 
 
@@ -733,7 +847,7 @@ def _is_lossy(path, tiffinfo=None):
 
 def _is_multiframe(path):
     """
-    Check if a path is a multiframe file.
+    Check if a path is a multiframe file according to vips.
 
     :param path: The path to the file
     :returns: True if multiframe.
@@ -743,18 +857,17 @@ def _is_multiframe(path):
         with _newFromFileLock:
             image = pyvips.Image.new_from_file(path)
     except Exception:
-        try:
-            open(path, 'rb').read(1)
-            raise
-        except Exception:
-            logger.warning('Is the file reachable and readable? (%r)', path)
-            raise OSError(path) from None
+        return None
     pages = 1
     if 'n-pages' in image.get_fields():
         pages = image.get_value('n-pages')
     return pages > 1
 
 
+def _is_new(path):
+    return os.path.basename(path).startswith(large_image.constants.NEW_IMAGE_PATH_FLAG)
+
+
 def _list_possible_sizes(width, height):
     """
     Given a width and height, return a list of possible sizes that could be
@@ -877,6 +990,8 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
         primary ifds.
     :param overwrite: if not True, throw an exception if the output path
         already exists.
+    :param keepFloat: if True, keep float or double data types as they are, if
+        possible.
 
     Additional optional parameters:
 
@@ -887,6 +1002,7 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
 
     :returns: outputPath if successful
     """
+    logger._pool_log_starttime = time.time()
     if kwargs.get('_concurrency'):
         os.environ['VIPS_CONCURRENCY'] = str(_concurrency_to_value(**kwargs))
     geospatial = kwargs.get('geospatial')
@@ -895,7 +1011,7 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
         logger.debug('Is file geospatial: %r', geospatial)
     suffix = format_hook('adjust_params', geospatial, kwargs, **kwargs)
     if suffix is False:
-        return
+        return None
     suffix = suffix or ('.tiff' if not geospatial else '.geo.tiff')
     if not outputPath:
         outputPath = os.path.splitext(inputPath)[0] + suffix
@@ -912,7 +1028,7 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
     except Exception:
         tiffinfo = None
     eightbit = _is_eightbit(inputPath, tiffinfo)
-    if not kwargs.get('compression', None):
+    if not kwargs.get('compression'):
         kwargs = kwargs.copy()
         lossy = _is_lossy(inputPath, tiffinfo)
         logger.debug('Is file lossy: %r', lossy)
@@ -927,10 +1043,15 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
             lidata = _data_from_large_image(str(inputPath), tempPath, **kwargs)
             logger.log(logging.DEBUG - 1, 'large_image information for %s: %r',
                        inputPath, lidata)
-            if lidata and (not is_vips(
-                    inputPath, (lidata['metadata']['sizeX'], lidata['metadata']['sizeY'])) or (
-                    len(lidata['metadata'].get('frames', [])) >= 2 and
-                    not _is_multiframe(inputPath))):
+            if lidata and (_is_new(inputPath) or _is_multiframe(inputPath)):
+                _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
+            elif lidata and (
+                (len(lidata['metadata'].get('frames', [])) >= 2 and
+                 not _is_multiframe(inputPath)) or
+                (np.dtype(lidata['tilesource'].dtype) != np.uint8 and
+                 np.dtype(lidata['tilesource'].dtype) != np.uint16) or
+                not is_vips(inputPath, (lidata['metadata']['sizeX'], lidata['metadata']['sizeY']))
+            ):
                 _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
             elif _is_multiframe(inputPath):
                 _generate_multiframe_tiff(inputPath, outputPath, tempPath, lidata, **kwargs)
@@ -940,6 +1061,8 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
                 except Exception:
                     if lidata:
                         _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
+                    else:
+                        raise
     return outputPath
 
 

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/large_image_converter/__main__.py

@@ -260,7 +260,7 @@ def main(args=sys.argv[1:]):
             desc = json.loads(info['ifds'][0]['tags'][tifftools.Tag.ImageDescription.value]['data'])
         except Exception:
             logger.debug('Cannot generate statistics.')
-            return
+            return None
         desc['large_image_converter']['conversion_stats'] = {
             'time': end_time - start_time,
             'filesize': os.path.getsize(dest),

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/large_image_converter.egg-info/PKG-INFO

@@ -1,23 +1,23 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: large-image-converter
-Version: 1.29.5.dev10
+Version: 1.33.4.dev39
 Summary: Converter for Large Image.
 Author: Kitware Inc
 Author-email: kitware@kitware.com
-License: Apache Software License 2.0
+License: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Topic :: Scientific/Engineering
 Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python :: 3
-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.8
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image-source-tiff>=1.29.5.dev10
+Requires-Dist: large-image-source-tiff>=1.33.4.dev39
 Requires-Dist: numpy
 Requires-Dist: psutil
 Requires-Dist: pyvips
@@ -27,16 +27,27 @@ Requires-Dist: glymur; extra == "jp2k"
 Provides-Extra: geospatial
 Requires-Dist: gdal; extra == "geospatial"
 Provides-Extra: sources
-Requires-Dist: large-image[sources]>=1.29.5.dev10; extra == "sources"
+Requires-Dist: large-image[sources]>=1.33.4.dev39; extra == "sources"
 Provides-Extra: stats
 Requires-Dist: packaging; extra == "stats"
 Requires-Dist: scikit-image; extra == "stats"
 Provides-Extra: all
 Requires-Dist: glymur; extra == "all"
 Requires-Dist: gdal; extra == "all"
-Requires-Dist: large-image[sources]>=1.29.5.dev10; extra == "all"
+Requires-Dist: large-image[sources]>=1.33.4.dev39; extra == "all"
 Requires-Dist: packaging; extra == "all"
 Requires-Dist: scikit-image; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 *********************
 Large Image Converter

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/large_image_converter.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image-source-tiff>=1.29.5.dev10
+large-image-source-tiff>=1.33.4.dev39
 numpy
 psutil
 pyvips
@@ -7,7 +7,7 @@ tifftools
 [all]
 glymur
 gdal
-large-image[sources]>=1.29.5.dev10
+large-image[sources]>=1.33.4.dev39
 packaging
 scikit-image
 
@@ -18,7 +18,7 @@ gdal
 glymur
 
 [sources]
-large-image[sources]>=1.29.5.dev10
+large-image[sources]>=1.33.4.dev39
 
 [stats]
 packaging

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/pyproject.toml

@@ -1,3 +1,7 @@
 [build-system]
 requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+fallback_version = "0.0.0"
+root = "../.."

{large-image-converter-1.29.5.dev10 → large_image_converter-1.33.4.dev39}/setup.py

@@ -9,52 +9,34 @@ description = 'Converter for Large Image.'
 long_description = readme
 
 
-def prerelease_local_scheme(version):
-    """
-    Return local scheme version unless building on master in CircleCI.
-
-    This function returns the local scheme version number
-    (e.g. 0.0.0.dev<N>+g<HASH>) unless building on CircleCI for a
-    pre-release in which case it ignores the hash and produces a
-    PEP440 compliant pre-release version number (e.g. 0.0.0.dev<N>).
-    """
-    from setuptools_scm.version import get_local_node_and_date
-
-    if os.getenv('CIRCLE_BRANCH') in ('master', ):
-        return ''
-    else:
-        return get_local_node_and_date(version)
-
-
 try:
     from setuptools_scm import get_version
 
-    version = get_version(root='../..', local_scheme=prerelease_local_scheme)
+    version = get_version(root='../..')
     limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else ''
 except (ImportError, LookupError):
     limit_version = ''
 
 setup(
     name='large-image-converter',
-    use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
-                     'fallback_version': '0.0.0'},
     description=description,
     long_description=long_description,
-    license='Apache Software License 2.0',
+    long_description_content_type='text/x-rst',
+    license='Apache-2.0',
     author='Kitware Inc',
     author_email='kitware@kitware.com',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: Apache Software License',
         'Topic :: Scientific/Engineering',
         'Intended Audience :: Science/Research',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
+    python_requires='>=3.9',
     install_requires=[
         f'large-image-source-tiff{limit_version}',
         'numpy',
@@ -88,5 +70,4 @@ setup(
     entry_points={
         'console_scripts': ['large_image_converter = large_image_converter.__main__:main'],
     },
-    python_requires='>=3.8',
 )