From 9c56495503e2529a938f4723750ede576957a914 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Sat, 10 Oct 2020 16:52:00 -0500 Subject: py-scikit-image: bump version (#19153) * py-scikit-image: bump version * address reviewer comments * address reviewer comments * address reviewer comments * py-scikit-image : update dependencies : part 2 * cloudpicke is a docs only dependency, enable it with a variant if necessary * address reviewer comments * cleanup build vs run deps * address reviewer comments --- .../builtin/packages/py-scikit-image/package.py | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 7d03788d3c..90f1470e96 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -11,21 +11,32 @@ class PyScikitImage(PythonPackage): filtering, warping, color manipulation, object detection, etc.""" homepage = "http://scikit-image.org/" - url = "https://pypi.io/packages/source/s/scikit-image/scikit-image-0.12.3.tar.gz" + url = "https://pypi.io/packages/source/s/scikit-image/scikit-image-0.17.2.tar.gz" + version('0.17.2', sha256='bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3') version('0.14.2', sha256='1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f') version('0.12.3', sha256='82da192f0e524701e89c5379c79200bc6dc21373f48bf7778a864c583897d7c7') extends('python', ignore=r'bin/.*\.py$') - depends_on('py-dask', type=('build', 'run')) - depends_on('pil', type=('build', 'run')) - depends_on('py-networkx', type=('build', 'run')) - depends_on('py-six', type=('build', 'run')) + depends_on('python@3.6:', when='@0.16.1:') + depends_on('py-cython@0.23.4:', type='build') depends_on('py-numpy', type=('build', 'run')) + depends_on('py-numpy@1.14.1:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-numpy@1.15.1:', type=('build', 'run'), when='@0.17.1:') depends_on('py-scipy', type=('build', 'run')) + depends_on('py-scipy@0.19.0:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-scipy@1.0.1:', type=('build', 'run'), when='@0.17.1:') + depends_on('py-dask', type=('build', 'run'), when='@:0.14.2') + depends_on('pil', type=('build', 'run')) + depends_on('pil@4.3:7.0, 7.1.2:', type=('build', 'run'), when='@0.16:') + depends_on('py-networkx', type=('build', 'run')) + depends_on('py-networkx@2.0:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-six', type=('build', 'run'), when='@:0.15.1') depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-matplotlib@2.0.0:2.9.999, 3.0.1:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-imageio@2.0.1:', type=('build', 'run'), when='@0.15.1:') + depends_on('py-imageio@2.3.0:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-tifffile@2019.7.26:', type=('build', 'run'), when='@0.17.1:') depends_on('py-pywavelets', type=('build', 'run'), when='@0.14:') - depends_on('py-cloudpickle', type=('build', 'run'), when='@0.14:') - depends_on('py-setuptools', type='build') - depends_on('py-cython@0.23.4:', type='build') + depends_on('py-pywavelets@1.1.1:', type=('build', 'run'), when='@0.16.1:') -- cgit v1.2.3-70-g09d2