From 096922c39d122037069a0e33048d640fa9e77914 Mon Sep 17 00:00:00 2001 From: Sinan Date: Sat, 24 Nov 2018 17:03:30 -0800 Subject: Package/py scikit learn (#9843) * add v0.20 specific dependency versions, also add cython and py-test as dependencies * make flake8 happy * make cython a build-only dependency --- var/spack/repos/builtin/packages/py-scikit-learn/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 9a5df494f2..7fb8cecb3a 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -20,6 +20,11 @@ class PyScikitLearn(PythonPackage): version('0.17.1', 'a2f8b877e6d99b1ed737144f5a478dfc') version('0.13.1', 'acba398e1d46274b8470f40d0926e6a4') - depends_on('python@2.6:2.8,3.3:') - depends_on('py-numpy@1.6.1:', type=('build', 'run')) - depends_on('py-scipy@0.9:', type=('build', 'run')) + depends_on('python@2.6:2.8,3.3:', when='@:0.19.1') + depends_on('python@2.7:2.8,3.4:', when='@0.20.0:') + depends_on('py-numpy@1.6.1:', type=('build', 'run'), when='@:0.19.1') + depends_on('py-numpy@1.8.2:', type=('build', 'run'), when='@0.20.0:') + depends_on('py-scipy@0.9:', type=('build', 'run'), when='@:0.19.1') + depends_on('py-scipy@0.13.3:', type=('build', 'run'), when='@0.20.0:') + depends_on('py-cython@0.23:', type='build') + depends_on('py-test@3.3.0:', type='test') -- cgit v1.2.3-60-g2f50