diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
commit | b3b5714fa72bf661003f27fbccba5697f5810115 (patch) | |
tree | c4eedb0b21200ba438cd1d0d67cd79e6b63926f7 /gnu/packages/machine-learning.scm | |
parent | b6f946f039afad6cbc7027d52685072f7fbb8d35 (diff) | |
parent | 51f30d4fdf197b1dad5ddb1405611fbaee55d1f2 (diff) | |
download | guix-b3b5714fa72bf661003f27fbccba5697f5810115.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/machine-learning.scm')
-rw-r--r-- | gnu/packages/machine-learning.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8262a418cc..50c41dc113 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -798,7 +798,7 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.20.4") + (version "0.22.1") (source (origin (method git-fetch) @@ -808,7 +808,7 @@ computing environments.") (file-name (git-file-name name version)) (sha256 (base32 - "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj")))) + "1xqxv210gsmjw094vc5ghq2y9lmm74qkk22pq6flcjzj51b86jxf")))) (build-system python-build-system) (arguments `(#:phases @@ -835,7 +835,8 @@ computing environments.") (inputs `(("openblas" ,openblas))) (native-inputs - `(("python-pytest" ,python-pytest) + `(("python-joblib" ,python-joblib) + ("python-pytest" ,python-pytest) ("python-pandas" ,python-pandas) ;for tests ("python-cython" ,python-cython))) (propagated-inputs @@ -2105,7 +2106,8 @@ These include a barrier, broadcast, and allreduce.") "02ada2yy6km6zgk2836kg1c97yrcpalvan34p8c57446finnpki1")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-joblib" ,python-joblib) + ("python-nose" ,python-nose))) (propagated-inputs `(("python-numba" ,python-numba) ("python-numpy" ,python-numpy) |