Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-03-10 20:50:02 +01:00
commit 50b99c90c8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
137 changed files with 3801 additions and 1464 deletions

View file

@ -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)