Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raise setuptools floor to 61.0.0, sphinx floor to 8.0.0, other small dependencies cleanup #820

Merged
merged 4 commits into from
Feb 4, 2025
Merged

raise setuptools floor to 61.0.0, sphinx floor to 8.0.0, other small dependencies cleanup #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
965d494
raise setuptools floor to 61.0.0, other small dependencies cleanup
jameslamb Jan 31, 2025
ef44c5f
Merge branch 'branch-25.04' into update-dependencies-yaml
jameslamb Feb 3, 2025
195d853
try allowing newer sphinx
jameslamb Feb 3, 2025
1bfd2fc
Merge branch 'update-dependencies-yaml' of github.com:jameslamb/cucim…
jameslamb Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As noted in the comment, this was pinned to an old version of sphinx in PR ( #481 ) to workaround this upstream pydata-sphinx-theme issue ( pydata/pydata-sphinx-theme#1094 )

Looks like that issue was subsequently fixed in PR ( pydata/pydata-sphinx-theme#1097 ) as part of pydata-sphinx-theme's 0.13.0 release

Given that has been out for a while (and several versions have since been released), think we are ok dropping it

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
View file
Open in desktop
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