Skip to content

Commit

Permalink
Merge pull request #1464 from girder/make-gdal-optional
Browse files Browse the repository at this point in the history
Make GDAL an optional dependency for the converter
  • Loading branch information
manthey authored Feb 12, 2024
2 parents 4187f6c + 7e1a63b commit b4cff79
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
### Improvements
- Log and recover from occasional openslide failures ([#1461](../../pull/1461))

### Changes
- Make GDAL an optional dependency for the converter ([#1464](../../pull/1464))

### Bug Fixes
- Fix an issue with uniform band depth on multi source with non uniform sources ([#1459](../../pull/1459))

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Large Image consists of several Python modules designed to work together. These
- ``all``: for all of the above

- ``large-image-converter``: A utility for using pyvips and other libraries to convert images into pyramidal tiff files that can be read efficiently by large_image.
You can specify extras_require of ``jp2k`` to include modules to allow output to JPEG2000 compression, ``sources`` to include all sources, and ``stats`` to include modules to allow computing compression noise statistics.
You can specify extras_require of ``jp2k`` to include modules to allow output to JPEG2000 compression, ``sources`` to include all sources, ``stats`` to include modules to allow computing compression noise statistics, ``geospatial`` to include support for converting geospatial sources, or ``all`` for all of the optional extras_require.

- Tile sources:

Expand Down
11 changes: 10 additions & 1 deletion utilities/converter/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3.12',
],
install_requires=[
'gdal',
f'large-image-source-tiff{limit_version}',
'numpy',
'psutil',
Expand All @@ -67,13 +66,23 @@ def prerelease_local_scheme(version):
'jp2k': [
'glymur',
],
'geospatial': [
'gdal',
],
'sources': [
f'large-image[sources]{limit_version}',
],
'stats': [
'packaging',
'scikit-image',
],
'all': [
'glymur',
'gdal',
f'large-image[sources]{limit_version}',
'packaging',
'scikit-image',
],
},
packages=find_packages(),
entry_points={
Expand Down

0 comments on commit b4cff79

Please sign in to comment.