Skip to content

Commit 08a6bc2

Browse files
authored
raise setuptools floor to 61.0.0, sphinx floor to 8.0.0, other small dependencies cleanup (#820)
Contributes to rapidsai/build-planning#146 * updates `setuptools` dependency to `>=61.0.0` ([the first version to support `pyproject.toml`](https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html)) * makes `numpydoc` pins in testing and docs the same * removes ceiling on `sphinx`, changes `sphinx` dependency to `>=8.0.0` (matching what was recently done across the RAPIDS, e.g. in rapidsai/cuml#6195) * ensures `numpydoc` makes it into `requirements` output from `rapids-dependency-file-generator` Authors: - James Lamb (https://github.com/jameslamb) Approvers: - https://github.com/jakirkham URL: #820
1 parent ad748d2 commit 08a6bc2

5 files changed

Lines changed: 13 additions & 16 deletions

File tree

conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- nbsphinx
2626
- ninja
2727
- numpy>=1.23.4,<3.0a0
28-
- numpydoc>=1.5
28+
- numpydoc>=1.7
2929
- nvcc_linux-64=11.8
3030
- openslide-python>=1.3.0
3131
- pip
@@ -42,7 +42,7 @@ dependencies:
4242
- recommonmark
4343
- scikit-image>=0.19.0,<0.26.0a0
4444
- scipy>=1.11.2
45-
- sphinx<6
45+
- sphinx>=8.0.0
4646
- sysroot_linux-64==2.28
4747
- tifffile>=2022.8.12
4848
- yasm

conda/environments/all_cuda-128_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- nbsphinx
2626
- ninja
2727
- numpy>=1.23.4,<3.0a0
28-
- numpydoc>=1.5
28+
- numpydoc>=1.7
2929
- openslide-python>=1.3.0
3030
- pip
3131
- pooch>=1.6.0
@@ -41,7 +41,7 @@ dependencies:
4141
- recommonmark
4242
- scikit-image>=0.19.0,<0.26.0a0
4343
- scipy>=1.11.2
44-
- sphinx<6
44+
- sphinx>=8.0.0
4545
- sysroot_linux-64==2.28
4646
- tifffile>=2022.8.12
4747
- yasm

conda/recipes/cucim/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ requirements:
6565
- rapids-build-backend >=0.3.0,<0.4.0.dev0
6666
- scikit-image >=0.19.0,<0.25.0a0
6767
- scipy >=1.6
68-
- setuptools >=24.2.0
68+
- setuptools >=61.0.0
6969
run:
7070
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
7171
{% if cuda_major != "11" %}

dependencies.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,10 @@ dependencies:
234234
packages:
235235
- ipython
236236
- nbsphinx
237-
- numpydoc>=1.5
237+
- &numpydoc numpydoc>=1.7
238238
- pydata-sphinx-theme
239239
- recommonmark
240-
# TODO: sphinx upper version limit can likely be removed after pydata 0.13
241-
# is released. See https://github.com/pydata/pydata-sphinx-theme/issues/1094
242-
- sphinx<6
240+
- sphinx>=8.0.0
243241
py_version:
244242
specific:
245243
- output_types: conda
@@ -264,7 +262,7 @@ dependencies:
264262
- output_types: [conda, requirements, pyproject]
265263
packages:
266264
- rapids-build-backend>=0.3.0,<0.4.0.dev0
267-
- setuptools>=24.2.0
265+
- setuptools>=61.0.0
268266
run:
269267
common:
270268
- output_types: [conda, requirements, pyproject]
@@ -319,7 +317,6 @@ dependencies:
319317
- openslide-python>=1.3.0; platform_machine=='x86_64'
320318
- matplotlib>=3.7
321319
- opencv-python-headless>=4.6
322-
- output_types: [pyproject]
320+
- output_types: [pyproject, requirements]
323321
packages:
324-
# Already added to requirements via docs. This is for tests.
325-
- numpydoc>=1.7
322+
- *numpydoc

python/cucim/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
build-backend = "rapids_build_backend.build"
66
requires = [
77
"rapids-build-backend>=0.3.0,<0.4.0.dev0",
8-
"setuptools>=24.2.0",
8+
"setuptools>=61.0.0",
99
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
1010

1111
[project]
@@ -80,10 +80,10 @@ developer = [
8080
docs = [
8181
"ipython",
8282
"nbsphinx",
83-
"numpydoc>=1.5",
83+
"numpydoc>=1.7",
8484
"pydata-sphinx-theme",
8585
"recommonmark",
86-
"sphinx<6",
86+
"sphinx>=8.0.0",
8787
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
8888

8989
[project.entry-points."console_scripts"]

0 commit comments

Comments
 (0)