Skip to content

Commit

Permalink
Allow scikit-image 0.21.0 (#580)
Browse files Browse the repository at this point in the history
Follow up to PR ( #573 )

This allows `scikit-image` version `0.21.0` to be installed alongside `cucim`.

Authors:
  - https://github.com/jakirkham

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Gregory Lee (https://github.com/grlee77)

URL: #580
  • Loading branch information
jakirkham authored Jul 17, 2023
1 parent d70ee28 commit fc33e56
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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 @@ -34,7 +34,7 @@ dependencies:
- pytest>=6.2.4
- python>=3.8,<3.11
- recommonmark
- scikit-image >=0.19.0,<0.21.0a0
- scikit-image >=0.19.0,<0.22.0a0
- scipy
- sphinx<6
- sysroot_linux-64==2.17
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ requirements:
- libcucim ={{ version }}
- numpy 1.21
- python
- scikit-image >=0.19.0,<0.21.0a0
- scikit-image >=0.19.0,<0.22.0a0
- scipy
run:
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
Expand All @@ -59,7 +59,7 @@ requirements:
- libcucim ={{ version }}
# - openslide # skipping here but benchmark binary would need openslide library
- python
- scikit-image >=0.19.0,<0.21.0a0
- scikit-image >=0.19.0,<0.22.0a0
- scipy

tests:
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ dependencies:
- jbig
- libwebp-base
- numpy >=1.21.3
- scikit-image >=0.19.0,<0.21.0a0
- scikit-image >=0.19.0,<0.22.0a0
- scipy
- xz
- zlib
Expand Down

0 comments on commit fc33e56

Please sign in to comment.