diff --git a/CHANGELOG.md b/CHANGELOG.md index fc59ed489..a26dbb342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 1.20.1 + +### Bug Fixes +- Fix packaging listing various source requirements ([#1064](../../pull/1064)) + ## 1.20.0 ### Features diff --git a/setup.py b/setup.py index cf9ed740a..479c892fd 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ import itertools import os -import sys from setuptools import setup @@ -45,10 +44,12 @@ def prerelease_local_scheme(version): sources = { 'bioformats': [f'large-image-source-bioformats{limit_version}'], 'deepzoom': [f'large-image-source-deepzoom{limit_version}'], + 'dicom': [f'large-image-source-dicom{limit_version} ; python_version < "3.8"'], 'dummy': [f'large-image-source-dummy{limit_version}'], 'gdal': [f'large-image-source-gdal{limit_version}'], 'mapnik': [f'large-image-source-mapnik{limit_version}'], 'multi': [f'large-image-source-multi{limit_version}'], + 'nd2': [f'large-image-source-nd2{limit_version} ; python_version < "3.7"'], 'ometiff': [f'large-image-source-ometiff{limit_version}'], 'openjpeg': [f'large-image-source-openjpeg{limit_version}'], 'openslide': [f'large-image-source-openslide{limit_version}'], @@ -58,14 +59,6 @@ def prerelease_local_scheme(version): 'tifffile': [f'large-image-source-tifffile{limit_version}'], 'vips': [f'large-image-source-vips{limit_version}'], } -if sys.version_info >= (3, 7): - sources.update({ - 'nd2': [f'large-image-source-nd2{limit_version}'], - }) -if sys.version_info >= (3, 8): - sources.update({ - 'dicom': [f'large-image-source-dicom{limit_version}'], - }) extraReqs.update(sources) extraReqs['sources'] = list(set(itertools.chain.from_iterable(sources.values()))) extraReqs['all'] = list(set(itertools.chain.from_iterable(extraReqs.values()))) diff --git a/sources/vips/setup.py b/sources/vips/setup.py index 02cfa8cdc..05ec05b51 100644 --- a/sources/vips/setup.py +++ b/sources/vips/setup.py @@ -23,6 +23,14 @@ def prerelease_local_scheme(version): return get_local_node_and_date(version) +try: + from setuptools_scm import get_version + + version = get_version(root='../..', local_scheme=prerelease_local_scheme) + limit_version = f'>={version}' if '+' not in version else '' +except (ImportError, LookupError): + limit_version = '' + setup( name='large-image-source-vips', use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme, @@ -45,7 +53,7 @@ def prerelease_local_scheme(version): 'Programming Language :: Python :: 3.11', ], install_requires=[ - 'large-image', + f'large-image{limit_version}', 'numpy', 'packaging', 'pyvips',