Merge pull request #123017 from DavHau/davhau-scikitlearn
python3Packages.scikitlearn: rename to scikit-learn
commita22ebb6d6d3954dacc66733205a402693a661bef
authorRobert Schütz <dev@schuetz-co.de>
dateMon 17 May 2021, 15:13 (5 years ago)
parent036a9620a1a14d
nixos/modules/services/development/jupyter/default.nix+1−1
@@ -131,7 +131,7 @@ in {
131131 env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
132132 ipykernel
133133 pandas
134− scikitlearn
134+ scikit-learn
135135 ]));
136136 in {
137137 displayName = "Python 3 for machine learning";
nixos/modules/services/development/jupyterhub/default.nix+1−1
@@ -117,7 +117,7 @@ in {
117117 env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
118118 ipykernel
119119 pandas
120− scikitlearn
120+ scikit-learn
121121 ]));
122122 in {
123123 displayName = "Python 3 for machine learning";
pkgs/development/python-modules/batchgenerators/default.nix+2−2
@@ -8,7 +8,7 @@
88, numpy
99, pillow
1010, scipy
11−, scikitlearn
11+, scikit-learn
1212, scikitimage
1313, threadpoolctl
1414}:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
2828 };
2929
3030 propagatedBuildInputs = [
31− future numpy pillow scipy scikitlearn scikitimage threadpoolctl
31+ future numpy pillow scipy scikit-learn scikitimage threadpoolctl
3232 ];
3333
3434 checkInputs = [ pytestCheckHook unittest2 ];
pkgs/development/python-modules/bayesian-optimization/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchFromGitHub
44, python
5−, scikitlearn
5+, scikit-learn
66, scipy
77, pytest
88, isPy27
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 };
2222
2323 propagatedBuildInputs = [
24− scikitlearn
24+ scikit-learn
2525 scipy
2626 ];
2727
pkgs/development/python-modules/cnvkit/default.nix+2−2
@@ -6,7 +6,7 @@
66, biopython
77, numpy
88, scipy
9−, scikitlearn
9+, scikit-learn
1010, pandas
1111, matplotlib
1212, reportlab
@@ -42,7 +42,7 @@ buildPythonPackage rec {
4242 biopython
4343 numpy
4444 scipy
45− scikitlearn
45+ scikit-learn
4646 pandas
4747 matplotlib
4848 reportlab
pkgs/development/python-modules/dask-glm/default.nix+2−2
@@ -7,7 +7,7 @@
77, multipledispatch
88, setuptools-scm
99, scipy
10−, scikitlearn
10+, scikit-learn
1111, pytestCheckHook
1212}:
1313
@@ -22,7 +22,7 @@ buildPythonPackage rec {
2222
2323 nativeBuildInputs = [ setuptools-scm ];
2424 checkInputs = [ pytestCheckHook ];
25− propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
25+ propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ];
2626
2727 meta = with lib; {
2828 homepage = "https://github.com/dask/dask-glm/";
pkgs/development/python-modules/dask-ml/default.nix+2−2
@@ -6,7 +6,7 @@
66, numpy, toolz # dask[array]
77, numba
88, pandas
9−, scikitlearn
9+, scikit-learn
1010, scipy
1111, dask-glm
1212, six
@@ -39,7 +39,7 @@ buildPythonPackage rec {
3939 numpy
4040 packaging
4141 pandas
42− scikitlearn
42+ scikit-learn
4343 scipy
4444 six
4545 toolz
pkgs/development/python-modules/dftfit/default.nix+2−2
@@ -8,7 +8,7 @@
88, pandas
99, scipy
1010, numpy
11−, scikitlearn
11+, scikit-learn
1212, lammps-cython
1313, pymatgen-lammps
1414, pytestrunner
@@ -34,7 +34,7 @@ buildPythonPackage rec {
3434 pandas
3535 scipy
3636 numpy
37− scikitlearn
37+ scikit-learn
3838 lammps-cython
3939 pymatgen-lammps
4040 ];
pkgs/development/python-modules/gensim/default.nix+2−2
@@ -5,7 +5,7 @@
55, six
66, scipy
77, smart_open
8−, scikitlearn, testfixtures, unittest2
8+, scikit-learn, testfixtures, unittest2
99, isPy3k
1010}:
1111
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121
2222 propagatedBuildInputs = [ smart_open numpy six scipy ];
2323
24− checkInputs = [ scikitlearn testfixtures unittest2 ];
24+ checkInputs = [ scikit-learn testfixtures unittest2 ];
2525
2626 # Two tests fail.
2727 #
pkgs/development/python-modules/graspologic/default.nix+2−2
@@ -8,7 +8,7 @@
88, matplotlib
99, networkx
1010, numpy
11−, scikitlearn
11+, scikit-learn
1212, scipy
1313, seaborn
1414}:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
3131 matplotlib
3232 networkx
3333 numpy
34− scikitlearn
34+ scikit-learn
3535 scipy
3636 seaborn
3737 ];
pkgs/development/python-modules/hdbscan/default.nix+2−2
@@ -5,7 +5,7 @@
55, numpy
66, pytestCheckHook
77, scipy
8−, scikitlearn
8+, scikit-learn
99, fetchPypi
1010, joblib
1111, six
@@ -29,7 +29,7 @@ buildPythonPackage rec {
2929 ];
3030
3131 nativeBuildInputs = [ cython ];
32− propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];
32+ propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ];
3333 preCheck = ''
3434 cd hdbscan/tests
3535 rm __init__.py
pkgs/development/python-modules/hmmlearn/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }:
1+{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }:
22
33buildPythonPackage rec {
44 pname = "hmmlearn";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 };
1111
1212 buildInputs = [ setuptools_scm cython ];
13− propagatedBuildInputs = [ numpy scikitlearn ];
13+ propagatedBuildInputs = [ numpy scikit-learn ];
1414 checkInputs = [ pytest ];
1515
1616 checkPhase = ''
pkgs/development/python-modules/hyppo/default.nix+2−2
@@ -4,7 +4,7 @@
44, fetchFromGitHub
55, pytestCheckHook , pytestcov , numba
66, numpy
7−, scikitlearn
7+, scikit-learn
88, scipy
99, matplotlib
1010, seaborn
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 propagatedBuildInputs = [
2727 numba
2828 numpy
29− scikitlearn
29+ scikit-learn
3030 scipy
3131 ];
3232
pkgs/development/python-modules/ignite/default.nix+2−2
@@ -8,7 +8,7 @@
88, mock
99, pytorch
1010, pynvml
11−, scikitlearn
11+, scikit-learn
1212, tqdm
1313}:
1414
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 };
2525
2626 checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];
27− propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
27+ propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ];
2828
2929 # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
3030 doCheck = pythonOlder "3.9";
pkgs/development/python-modules/imbalanced-learn/0.4.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
1+{ lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }:
22
33buildPythonPackage rec {
44 pname = "imbalanced-learn";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";
1010 };
1111
12− propagatedBuildInputs = [ scikitlearn ];
12+ propagatedBuildInputs = [ scikit-learn ];
1313 checkInputs = [ nose pytest pandas ];
1414 checkPhase = ''
1515 export HOME=$PWD
pkgs/development/python-modules/imbalanced-learn/default.nix+2−2
@@ -4,7 +4,7 @@
44, isPy27
55, pandas
66, pytestCheckHook
7−, scikitlearn
7+, scikit-learn
88}:
99
1010buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w";
1818 };
1919
20− propagatedBuildInputs = [ scikitlearn ];
20+ propagatedBuildInputs = [ scikit-learn ];
2121 checkInputs = [ pytestCheckHook pandas ];
2222 preCheck = ''
2323 export HOME=$TMPDIR
pkgs/development/python-modules/kmapper/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4−, scikitlearn
4+, scikit-learn
55, numpy
66, scipy
77, jinja2
@@ -25,7 +25,7 @@ buildPythonPackage rec {
2525 };
2626
2727 propagatedBuildInputs = [
28− scikitlearn
28+ scikit-learn
2929 numpy
3030 scipy
3131 jinja2
pkgs/development/python-modules/librosa/default.nix+2−2
@@ -4,7 +4,7 @@
44, joblib
55, matplotlib
66, six
7−, scikitlearn
7+, scikit-learn
88, decorator
99, audioread
1010, resampy
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839";
2222 };
2323
24− propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ];
24+ propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ];
2525
2626 # No tests
2727 # 1. Internet connection is required
pkgs/development/python-modules/lightgbm/default.nix+2−2
@@ -4,7 +4,7 @@
44, cmake
55, numpy
66, scipy
7−, scikitlearn
7+, scikit-learn
88, llvmPackages ? null
99}:
1010
@@ -39,7 +39,7 @@ buildPythonPackage rec {
3939 propagatedBuildInputs = [
4040 numpy
4141 scipy
42− scikitlearn
42+ scikit-learn
4343 ];
4444
4545 postConfigure = ''
pkgs/development/python-modules/mlrose/default.nix+2−2
@@ -3,7 +3,7 @@
33, buildPythonPackage
44, fetchFromGitHub
55, fetchpatch
6−, scikitlearn
6+, scikit-learn
77, pytestCheckHook
88, pytest-randomly
99}:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
2828 })
2929 ];
3030
31− propagatedBuildInputs = [ scikitlearn ];
31+ propagatedBuildInputs = [ scikit-learn ];
3232 checkInputs = [ pytest-randomly pytestCheckHook ];
3333
3434 postPatch = ''
pkgs/development/python-modules/mlxtend/default.nix+3−3
@@ -5,7 +5,7 @@
55, pytestCheckHook
66, scipy
77, numpy
8−, scikitlearn
8+, scikit-learn
99, pandas
1010, matplotlib
1111, joblib
@@ -33,7 +33,7 @@ buildPythonPackage rec {
3333 propagatedBuildInputs = [
3434 scipy
3535 numpy
36− scikitlearn
36+ scikit-learn
3737 pandas
3838 matplotlib
3939 joblib
@@ -45,7 +45,7 @@ buildPythonPackage rec {
4545 license= licenses.bsd3;
4646 maintainers = with maintainers; [ evax ];
4747 platforms = platforms.unix;
48− # incompatible with nixpkgs scikitlearn version
48+ # incompatible with nixpkgs scikit-learn version
4949 broken = true;
5050 };
5151}
pkgs/development/python-modules/mne-python/default.nix+2−2
@@ -11,7 +11,7 @@
1111, matplotlib
1212, nibabel
1313, pandas
14−, scikitlearn
14+, scikit-learn
1515}:
1616
1717buildPythonPackage rec {
@@ -40,7 +40,7 @@ buildPythonPackage rec {
4040 matplotlib
4141 nibabel
4242 pandas
43− scikitlearn
43+ scikit-learn
4444 ];
4545 preCheck = ''
4646 export HOME=$TMP
pkgs/development/python-modules/moviepy/default.nix+3−3
@@ -13,14 +13,14 @@
1313, advancedProcessing ? false
1414, opencv3 ? null
1515, scikitimage ? null
16−, scikitlearn ? null
16+, scikit-learn ? null
1717, scipy ? null
1818, matplotlib ? null
1919, youtube-dl ? null
2020}:
2121
2222assert advancedProcessing -> (
23− opencv3 != null && scikitimage != null && scikitlearn != null
23+ opencv3 != null && scikitimage != null && scikit-learn != null
2424 && scipy != null && matplotlib != null && youtube-dl != null);
2525
2626buildPythonPackage rec {
@@ -40,7 +40,7 @@ buildPythonPackage rec {
4040 propagatedBuildInputs = [
4141 numpy decorator imageio imageio-ffmpeg tqdm requests proglog
4242 ] ++ (lib.optionals advancedProcessing [
43− opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl
43+ opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl
4444 ]);
4545
4646 meta = with lib; {
pkgs/development/python-modules/nilearn/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib
2−, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }:
2+, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }:
33
44buildPythonPackage rec {
55 pname = "nilearn";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
2020 numpy
2121 pandas
2222 requests
23− scikitlearn
23+ scikit-learn
2424 scipy
2525 ];
2626
pkgs/development/python-modules/osmnx/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
2−, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}:
2+, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}:
33
44buildPythonPackage rec {
55 pname = "osmnx";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z";
1313 };
1414
15− propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
15+ propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ];
1616
1717 # requires network
1818 doCheck = false;
pkgs/development/python-modules/persim/default.nix+2−2
@@ -6,7 +6,7 @@
66, joblib
77, matplotlib
88, numpy
9−, scikitlearn
9+, scikit-learn
1010, scipy
1111, pytestCheckHook
1212}:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 joblib
2727 matplotlib
2828 numpy
29− scikitlearn
29+ scikit-learn
3030 scipy
3131 ];
3232
pkgs/development/python-modules/ppscore/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, isPy27
55, pandas
6−, scikitlearn
6+, scikit-learn
77, pytestCheckHook
88}:
99
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323
2424 propagatedBuildInputs = [
2525 pandas
26− scikitlearn
26+ scikit-learn
2727 ];
2828
2929 meta = with lib; {
pkgs/development/python-modules/pygbm/default.nix+2−2
@@ -4,7 +4,7 @@
44, scipy
55, numpy
66, numba
7−, scikitlearn
7+, scikit-learn
88, pytest
99, pythonOlder
1010}:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
2525 scipy
2626 numpy
2727 numba
28− scikitlearn
28+ scikit-learn
2929 ];
3030
3131 checkInputs = [
pkgs/development/python-modules/pynndescent/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, nose
5−, scikitlearn
5+, scikit-learn
66, scipy
77, numba
88, llvmlite
@@ -19,7 +19,7 @@ buildPythonPackage rec {
1919 };
2020
2121 propagatedBuildInputs = [
22− scikitlearn
22+ scikit-learn
2323 scipy
2424 numba
2525 llvmlite
pkgs/development/python-modules/pytorch-metric-learning/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, isPy27
55, numpy
6−, scikitlearn
6+, scikit-learn
77, pytestCheckHook
88, pytorch
99, torchvision
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 propagatedBuildInputs = [
2727 numpy
2828 pytorch
29− scikitlearn
29+ scikit-learn
3030 torchvision
3131 tqdm
3232 ];
pkgs/development/python-modules/qiskit-aqua/default.nix+2−2
@@ -14,7 +14,7 @@
1414, qiskit-ignis
1515, qiskit-terra
1616, quandl
17−, scikitlearn
17+, scikit-learn
1818, yfinance
1919 # Optional inputs
2020, withTorch ? false
@@ -59,7 +59,7 @@ buildPythonPackage rec {
5959 qiskit-terra
6060 qiskit-ignis
6161 quandl
62− scikitlearn
62+ scikit-learn
6363 yfinance
6464 ] ++ lib.optionals (withTorch) [ pytorch ]
6565 ++ lib.optionals (withPyscf) [ pyscf ]
pkgs/development/python-modules/qiskit-ignis/default.nix+2−2
@@ -5,7 +5,7 @@
55, python
66, numpy
77, qiskit-terra
8−, scikitlearn
8+, scikit-learn
99, scipy
1010 # Optional package inputs
1111, withVisualization ? false
@@ -44,7 +44,7 @@ buildPythonPackage rec {
4444 propagatedBuildInputs = [
4545 numpy
4646 qiskit-terra
47− scikitlearn
47+ scikit-learn
4848 scipy
4949 ] ++ lib.optionals (withCvx) [ cvxpy ]
5050 ++ lib.optionals (withVisualization) [ matplotlib ]
pkgs/development/python-modules/ripser/default.nix+2−2
@@ -5,7 +5,7 @@
55, cython
66, numpy
77, scipy
8−, scikitlearn
8+, scikit-learn
99, persim
1010, pytest
1111}:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
2828 cython
2929 numpy
3030 scipy
31− scikitlearn
31+ scikit-learn
3232 persim
3333 ];
3434
pkgs/development/python-modules/scikit-bio/default.nix+2−2
@@ -12,7 +12,7 @@
1212, pandas
1313, scipy
1414, hdmedians
15−, scikitlearn
15+, scikit-learn
1616, coverage
1717, python
1818, isPy3k
@@ -30,7 +30,7 @@ buildPythonPackage rec {
3030
3131 buildInputs = [ cython ];
3232 checkInputs = [ coverage ];
33− propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ];
33+ propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikit-learn ];
3434
3535 # cython package not included for tests
3636 doCheck = false;
pkgs/development/python-modules/scikitlearn/0.20.nix → pkgs/development/python-modules/scikit-learn/0.20.nixrenamed
The content is the same.
pkgs/development/python-modules/scikitlearn/default.nix → pkgs/development/python-modules/scikit-learn/default.nixrenamed+18−4
@@ -7,7 +7,8 @@
77, glibcLocales
88, numpy
99, scipy
10−, pytest
10+, pytestCheckHook
11+, pytest-xdist
1112, pillow
1213, cython
1314, joblib
@@ -54,17 +55,30 @@ buildPythonPackage rec {
5455 joblib
5556 threadpoolctl
5657 ];
57− checkInputs = [ pytest ];
58+
59+ checkInputs = [ pytestCheckHook pytest-xdist ];
5860
5961 LC_ALL="en_US.UTF-8";
6062
63+ preBuild = ''
64+ export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES
65+ '';
66+
6167 doCheck = !stdenv.isAarch64;
68+
6269 # Skip test_feature_importance_regression - does web fetch
63− checkPhase = ''
70+ disabledTests = [ "test_feature_importance_regression" ];
71+
72+ pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" "--pyargs" "sklearn" ];
73+
74+ preCheck = ''
6475 cd $TMPDIR
65− HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn
76+ export HOME=$TMPDIR
77+ export OMP_NUM_THREADS=1
6678 '';
6779
80+ pythonImportsCheck = [ "sklearn" ];
81+
6882 meta = with lib; {
6983 description = "A set of python modules for machine learning and data mining";
7084 changelog = let
pkgs/development/python-modules/scikit-optimize/default.nix+2−2
@@ -5,7 +5,7 @@
55, matplotlib
66, numpy
77, scipy
8−, scikitlearn
8+, scikit-learn
99, pyaml
1010, pytestCheckHook
1111}:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 matplotlib
2727 numpy
2828 scipy
29− scikitlearn
29+ scikit-learn
3030 pyaml
3131 ];
3232
pkgs/development/python-modules/scikit-tda/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, numpy
55, scipy
6−, scikitlearn
6+, scikit-learn
77, matplotlib
88, numba
99, umap-learn
@@ -32,7 +32,7 @@ buildPythonPackage rec {
3232 propagatedBuildInputs = [
3333 numpy
3434 scipy
35− scikitlearn
35+ scikit-learn
3636 matplotlib
3737 numba
3838 umap-learn
pkgs/development/python-modules/seqeval/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchFromGitHub
44, numpy
5−, scikitlearn
5+, scikit-learn
66, perl
77, pytestCheckHook
88}:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
2727
2828 propagatedBuildInputs = [
2929 numpy
30− scikitlearn
30+ scikit-learn
3131 ];
3232
3333 checkInputs = [
pkgs/development/python-modules/shap/default.nix+2−2
@@ -5,7 +5,7 @@
55, pytestCheckHook
66, numpy
77, scipy
8−, scikitlearn
8+, scikit-learn
99, pandas
1010, tqdm
1111, slicer
@@ -30,7 +30,7 @@ buildPythonPackage rec {
3030 propagatedBuildInputs = [
3131 numpy
3232 scipy
33− scikitlearn
33+ scikit-learn
3434 pandas
3535 tqdm
3636 slicer
pkgs/development/python-modules/sklearn-deap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
1+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }:
22
33buildPythonPackage rec {
44 pname = "sklearn-deap";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
2020 })
2121 ];
2222
23− propagatedBuildInputs = [ numpy scipy deap scikitlearn ];
23+ propagatedBuildInputs = [ numpy scipy deap scikit-learn ];
2424
2525 checkPhase = ''
2626 ${python.interpreter} test.py
pkgs/development/python-modules/skorch/default.nix+2−2
@@ -8,7 +8,7 @@
88, numpy
99, pandas
1010, pytorch
11−, scikitlearn
11+, scikit-learn
1212, scipy
1313, tabulate
1414, tqdm
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4";
2424 };
2525
26− propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ];
26+ propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];
2727 checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ];
2828
2929 disabledTests = [
pkgs/development/python-modules/textacy/default.nix+2−2
@@ -9,7 +9,7 @@
99, pyphen
1010, pytest
1111, requests
12−, scikitlearn
12+, scikit-learn
1313, scipy
1414, spacy
1515, srsly
@@ -35,7 +35,7 @@ buildPythonPackage rec {
3535 pyemd
3636 pyphen
3737 requests
38− scikitlearn
38+ scikit-learn
3939 scipy
4040 spacy
4141 srsly
pkgs/development/python-modules/umap-learn/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, nose
55, numpy
6−, scikitlearn
6+, scikit-learn
77, scipy
88, numba
99, pynndescent
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424
2525 propagatedBuildInputs = [
2626 numpy
27− scikitlearn
27+ scikit-learn
2828 scipy
2929 numba
3030 pynndescent
pkgs/development/python-modules/vowpalwabbit/default.nix+2−2
@@ -11,7 +11,7 @@
1111, pygments
1212, numpy
1313, scipy
14−, scikitlearn }:
14+, scikit-learn }:
1515
1616buildPythonPackage rec {
1717 pname = "vowpalwabbit";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
3636
3737 propagatedBuildInputs = [
3838 numpy
39− scikitlearn
39+ scikit-learn
4040 scipy
4141 ];
4242
pkgs/development/python-modules/word2vec/default.nix+2−2
@@ -4,7 +4,7 @@
44, fetchzip
55, cython
66, numpy
7−, scikitlearn
7+, scikit-learn
88, six
99, setuptools_scm
1010, gcc
@@ -30,7 +30,7 @@ buildPythonPackage rec {
3030
3131 nativeBuildInputs = [ setuptools_scm gcc ];
3232
33− propagatedBuildInputs = [ cython numpy scikitlearn six ];
33+ propagatedBuildInputs = [ cython numpy scikit-learn six ];
3434
3535 checkInputs = [ pytest pytestcov ];
3636
pkgs/development/python-modules/xgboost/default.nix+2−2
@@ -2,7 +2,7 @@
22, pytestCheckHook
33, cmake
44, scipy
5−, scikitlearn
5+, scikit-learn
66, stdenv
77, xgboost
88, substituteAll
@@ -22,7 +22,7 @@ buildPythonPackage {
2222 propagatedBuildInputs = [ scipy ];
2323 checkInputs = [
2424 pytestCheckHook
25− scikitlearn
25+ scikit-learn
2626 pandas
2727 matplotlib
2828 graphviz
pkgs/top-level/python-packages.nix+3−1
@@ -7362,10 +7362,12 @@ in {
73627362
73637363 scikitimage = callPackage ../development/python-modules/scikit-image { };
73647364
7365− scikitlearn = callPackage ../development/python-modules/scikitlearn {
7365+ scikit-learn = callPackage ../development/python-modules/scikit-learn {
73667366 inherit (pkgs) gfortran glibcLocales;
73677367 };
73687368
7369+ scikitlearn = self.scikit-learn;
7370+
73697371 scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
73707372
73717373 scikits-odes = callPackage ../development/python-modules/scikits-odes { };
pkgs/top-level/python2-packages.nix+1−1
@@ -524,7 +524,7 @@ with self; with super; {
524524
525525 scandir = callPackage ../development/python-modules/scandir { };
526526
527− scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {
527+ scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix {
528528 inherit (pkgs) gfortran glibcLocales;
529529 };
530530