Skip to content

Commit

Permalink
Merge pull request #1390 from girder/setup-requires
Browse files Browse the repository at this point in the history
Handle setup_requires deprecation.
  • Loading branch information
manthey authored Nov 29, 2023
2 parents 9a43c4e + 6bfd361 commit dd1b354
Show file tree
Hide file tree
Showing 47 changed files with 77 additions and 28 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
- Use vips resize rather than reduce to increase speed ([#1384](../../pull/1384))
- Added annotation to geojson endpoint and utility ([#1385](../../pull/1385))

### Changes
- Handle setup_requires deprecation ([#1390](../../pull/1390))

### Bug Fixes
- Fix an issue applying ICC profile adjustments to multiple image modes ([#1382](../../pull/1382))
- Guard against bad tifffile magnification values ([#1383](../../pull/1383))
Expand Down
3 changes: 3 additions & 0 deletions girder/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion girder/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='girder-large-image',
use_scm_version={'root': '..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm', 'setuptools-git'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions girder_annotation/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion girder_annotation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='girder-large-image-annotation',
use_scm_version={'root': '..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm', 'setuptools-git'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
11 changes: 8 additions & 3 deletions ruff.toml → pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"

[tool.ruff]
include = ["*.py", "*.pyi", "**/pyproject.toml", "*.ipynb"]
exclude = [
"build",
Expand Down Expand Up @@ -56,14 +61,14 @@ select = [
"RSE",
]

[per-file-ignores]
[tool.ruff.per-file-ignores]
# allow "useless expressions" as it shows output
# allow non-top level imports
# allow long lines
"docs/large_image_examples.ipynb" = ["B018", "E402", "E501"]

[flake8-quotes]
[tool.ruff.flake8-quotes]
inline-quotes = "single"

[mccabe]
[tool.ruff.mccabe]
max-complexity = 14
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ def prerelease_local_scheme(version):
name='large-image',
use_scm_version={'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=[
'setuptools-scm',
],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/bioformats/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/bioformats/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-bioformats',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/deepzoom/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/deepzoom/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-deepzoom',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/dicom/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/dicom/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-dicom',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/dummy/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/dummy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-dummy',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/gdal/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/gdal/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-gdal',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/mapnik/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/mapnik/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-mapnik',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/multi/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/multi/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-multi',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/nd2/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/nd2/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-nd2',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/ometiff/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/ometiff/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-ometiff',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/openjpeg/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/openjpeg/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-openjpeg',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/openslide/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/openslide/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-openslide',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/pil/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/pil/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-pil',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/rasterio/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/rasterio/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def prerelease_local_scheme(version):
'local_scheme': prerelease_local_scheme,
'fallback_version': 'development',
},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/test/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/test/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-test',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/tiff/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/tiff/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-tiff',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/tifffile/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/tifffile/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-tifffile',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/vips/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/vips/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-vips',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions sources/zarr/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion sources/zarr/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def prerelease_local_scheme(version):
name='large-image-source-zarr',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions utilities/converter/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion utilities/converter/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def prerelease_local_scheme(version):
name='large-image-converter',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down
3 changes: 3 additions & 0 deletions utilities/tasks/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]
build-backend = "setuptools.build_meta"
1 change: 0 additions & 1 deletion utilities/tasks/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def prerelease_local_scheme(version):
name='large-image-tasks',
use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme,
'fallback_version': '0.0.0'},
setup_requires=['setuptools-scm'],
description=description,
long_description=long_description,
license='Apache Software License 2.0',
Expand Down

0 comments on commit dd1b354

Please sign in to comment.