From b4e587bd0b8f489eb367c83225c1a2fe67292444 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 12 May 2020 16:43:56 -0500 Subject: [PATCH] py-scikit-learn: add new version (#16607) --- .../repos/builtin/packages/py-scikit-learn/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 4c717e20ee..9d3fa4ff2c 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -3,14 +3,12 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * - class PyScikitLearn(PythonPackage): """A set of python modules for machine learning and data mining.""" homepage = "https://pypi.python.org/pypi/scikit-learn" - url = "https://pypi.io/packages/source/s/scikit-learn/scikit-learn-0.22.tar.gz" + url = "https://pypi.io/packages/source/s/scikit-learn/scikit-learn-0.23.0.tar.gz" git = "https://github.com/scikit-learn/scikit-learn.git" maintainers = ['adamjstewart'] @@ -33,6 +31,7 @@ class PyScikitLearn(PythonPackage): ] version('master', branch='master') + version('0.23.0', sha256='639a53df6273acc6a7510fb0c658b94e0c70bb13dafff9d14932c981ff9baff4') version('0.22.1', sha256='51ee25330fc244107588545c70e2f3570cfc4017cff09eed69d6e1d82a212b7d') version('0.22', sha256='314abf60c073c48a1e95feaae9f3ca47a2139bd77cebb5b877c23a45c9e03012') version('0.21.3', sha256='eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003') @@ -53,13 +52,17 @@ class PyScikitLearn(PythonPackage): depends_on('python@2.6:2.8,3.3:', when='@:0.19', type=('build', 'run')) depends_on('python@2.7:2.8,3.4:', when='@0.20.0:0.20.999', type=('build', 'run')) depends_on('python@3.5:', when='@0.21:', type=('build', 'run')) + depends_on('python@3.6:', when='@0.23:', type=('build', 'run')) depends_on('py-numpy@1.6.1:', when='@:0.19', type=('build', 'run')) depends_on('py-numpy@1.8.2:', when='@0.20.0:0.20.999', type=('build', 'run')) depends_on('py-numpy@1.11.0:', when='@0.21:', type=('build', 'run')) + depends_on('py-numpy@1.13.3:', when='@0.23:', type=('build', 'run')) depends_on('py-scipy@0.9:', when='@:0.19', type=('build', 'run')) depends_on('py-scipy@0.13.3:', when='@0.20.0:0.20.999', type=('build', 'run')) depends_on('py-scipy@0.17.0:', when='@0.21:', type=('build', 'run')) + depends_on('py-scipy@0.19.1:', when='@0.23:', type=('build', 'run')) depends_on('py-joblib@0.11:', type=('build', 'run')) + depends_on('py-threadpoolctl@2.0.0:', when='@0.23:', type=('build', 'run')) depends_on('py-cython@0.23:', type='build') depends_on('py-cython@0.28.5:', when='@0.21:', type='build') depends_on('py-pytest@3.3.0:', type='test')