Skip to content

Commit

Permalink
raise setuptools floor to 61.0.0, sphinx floor to 8.0.0, other small …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
jameslamb authored Feb 4, 2025
1 parent ad748d2 commit 08a6bc2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- nbsphinx
- ninja
- numpy>=1.23.4,<3.0a0
- numpydoc>=1.5
- numpydoc>=1.7
- nvcc_linux-64=11.8
- openslide-python>=1.3.0
- pip
Expand All @@ -42,7 +42,7 @@ dependencies:
- recommonmark
- scikit-image>=0.19.0,<0.26.0a0
- scipy>=1.11.2
- sphinx<6
- sphinx>=8.0.0
- sysroot_linux-64==2.28
- tifffile>=2022.8.12
- yasm
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- nbsphinx
- ninja
- numpy>=1.23.4,<3.0a0
- numpydoc>=1.5
- numpydoc>=1.7
- openslide-python>=1.3.0
- pip
- pooch>=1.6.0
Expand All @@ -41,7 +41,7 @@ dependencies:
- recommonmark
- scikit-image>=0.19.0,<0.26.0a0
- scipy>=1.11.2
- sphinx<6
- sphinx>=8.0.0
- sysroot_linux-64==2.28
- tifffile>=2022.8.12
- yasm
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ requirements:
- rapids-build-backend >=0.3.0,<0.4.0.dev0
- scikit-image >=0.19.0,<0.25.0a0
- scipy >=1.6
- setuptools >=24.2.0
- setuptools >=61.0.0
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major != "11" %}
Expand Down
13 changes: 5 additions & 8 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,10 @@ dependencies:
packages:
- ipython
- nbsphinx
- numpydoc>=1.5
- &numpydoc numpydoc>=1.7
- pydata-sphinx-theme
- recommonmark
# TODO: sphinx upper version limit can likely be removed after pydata 0.13
# is released. See https://github.com/pydata/pydata-sphinx-theme/issues/1094
- sphinx<6
- sphinx>=8.0.0
py_version:
specific:
- output_types: conda
Expand All @@ -264,7 +262,7 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- setuptools>=24.2.0
- setuptools>=61.0.0
run:
common:
- output_types: [conda, requirements, pyproject]
Expand Down Expand Up @@ -319,7 +317,6 @@ dependencies:
- openslide-python>=1.3.0; platform_machine=='x86_64'
- matplotlib>=3.7
- opencv-python-headless>=4.6
- output_types: [pyproject]
- output_types: [pyproject, requirements]
packages:
# Already added to requirements via docs. This is for tests.
- numpydoc>=1.7
- *numpydoc
6 changes: 3 additions & 3 deletions python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
build-backend = "rapids_build_backend.build"
requires = [
"rapids-build-backend>=0.3.0,<0.4.0.dev0",
"setuptools>=24.2.0",
"setuptools>=61.0.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project]
Expand Down Expand Up @@ -80,10 +80,10 @@ developer = [
docs = [
"ipython",
"nbsphinx",
"numpydoc>=1.5",
"numpydoc>=1.7",
"pydata-sphinx-theme",
"recommonmark",
"sphinx<6",
"sphinx>=8.0.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.entry-points."console_scripts"]
Expand Down

0 comments on commit 08a6bc2

Please sign in to comment.