Skip to content

Commit

Permalink
misc min version updates from scikit-image
Browse files Browse the repository at this point in the history
  • Loading branch information
grlee77 committed Dec 16, 2024
1 parent 5e13cf4 commit b69b41f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ dependencies:
- gcc_linux-64=11.*
- imagecodecs>=2021.6.8
- ipython
- lazy_loader>=0.1
- lazy-loader>=0.4
- libcufile-dev=1.4.0.31
- libcufile=1.4.0.31
- libnvjpeg-dev=11.6.0.55
- libnvjpeg=11.6.0.55
- matplotlib-base
- matplotlib-base>=3.7
- nbsphinx
- ninja
- numpy>=1.24,<3.0a0
Expand All @@ -38,13 +38,13 @@ dependencies:
- pytest-xdist
- pytest>=7.0.0,<9.0.0a0
- python>=3.10,<3.13
- pywavelets>=1.0
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0a0
- scipy>=1.11.2
- sphinx<6
- sysroot_linux-64==2.17
- tifffile>=2022.7.28
- tifffile>=2022.8.12
- yasm
- pip:
- opencv-python-headless>=4.6
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ dependencies:
- gcc_linux-64=11.*
- imagecodecs>=2021.6.8
- ipython
- lazy_loader>=0.1
- lazy-loader>=0.4
- libcufile-dev
- libnvjpeg-dev
- libnvjpeg-static
- matplotlib-base
- matplotlib-base>=3.7
- nbsphinx
- ninja
- numpy>=1.24,<3.0a0
Expand All @@ -37,13 +37,13 @@ dependencies:
- pytest-xdist
- pytest>=7.0.0,<9.0.0a0
- python>=3.10,<3.13
- pywavelets>=1.0
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0a0
- scipy>=1.11.2
- sphinx<6
- sysroot_linux-64==2.17
- tifffile>=2022.7.28
- tifffile>=2022.8.12
- yasm
- pip:
- opencv-python-headless>=4.6
Expand Down
12 changes: 6 additions & 6 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- click
- lazy_loader>=0.1
- lazy-loader>=0.4
- numpy>=1.24,<3.0a0
- scikit-image>=0.19.0,<0.26.0a0
- scipy>=1.11.2
Expand Down Expand Up @@ -289,13 +289,13 @@ dependencies:
- pytest-cov>=2.12.1
- pytest-lazy-fixtures>=1.0.0
- pytest-xdist
- tifffile>=2022.7.28
- tifffile>=2022.8.12
- pooch>=1.6.0 # needed to download scikit-image sample data
- pywavelets>=1.0
- pywavelets>=1.6
- output_types: [conda]
packages:
- imagecodecs>=2021.6.8
- matplotlib-base
- matplotlib-base>=3.7
- openslide-python>=1.3.0
- pip
- pip:
Expand All @@ -305,9 +305,9 @@ dependencies:
# skip packages on arm64 that don't provide a wheel
- imagecodecs>=2021.6.8; platform_machine=='x86_64'
- openslide-python>=1.3.0; platform_machine=='x86_64'
- matplotlib
- matplotlib>=3.7
- opencv-python-headless>=4.6
- output_types: [pyproject]
packages:
# Already added to requirements via docs. This is for tests.
- numpydoc>=1.5
- numpydoc>=1.7
10 changes: 5 additions & 5 deletions python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requires-python = ">=3.10"
dependencies = [
"click",
"cupy-cuda11x>=12.0.0",
"lazy_loader>=0.1",
"lazy-loader>=0.4",
"numpy>=1.24,<3.0a0",
"scikit-image>=0.19.0,<0.26.0a0",
"scipy>=1.11.2",
Expand Down Expand Up @@ -58,8 +58,8 @@ Tracker = "https://github.com/rapidsai/cucim/issues"
[project.optional-dependencies]
test = [
"imagecodecs>=2021.6.8; platform_machine=='x86_64'",
"matplotlib",
"numpydoc>=1.5",
"matplotlib>=3.7",
"numpydoc>=1.7",
"opencv-python-headless>=4.6",
"openslide-python>=1.3.0; platform_machine=='x86_64'",
"pooch>=1.6.0",
Expand All @@ -68,8 +68,8 @@ test = [
"pytest-lazy-fixtures>=1.0.0",
"pytest-xdist",
"pytest>=7.0.0,<9.0.0a0",
"pywavelets>=1.0",
"tifffile>=2022.7.28",
"pywavelets>=1.6",
"tifffile>=2022.8.12",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
developer = [
"black",
Expand Down

0 comments on commit b69b41f

Please sign in to comment.