Skip to content

Commit

Permalink
raise setuptools floor to 61.0.0, other small dependencies cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Jan 31, 2025
1 parent abdf415 commit 965d494
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion 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 Down
2 changes: 1 addition & 1 deletion 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 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
9 changes: 4 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ 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
Expand Down Expand Up @@ -264,7 +264,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 +319,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
4 changes: 2 additions & 2 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,7 +80,7 @@ developer = [
docs = [
"ipython",
"nbsphinx",
"numpydoc>=1.5",
"numpydoc>=1.7",
"pydata-sphinx-theme",
"recommonmark",
"sphinx<6",
Expand Down

0 comments on commit 965d494

Please sign in to comment.