Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python3Packages.scikitlearn: rename to scikit-learn #123017

Merged
merged 2 commits into from May 17, 2021
Merged

python3Packages.scikitlearn: rename to scikit-learn #123017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd8f3e6
python3Packages.scikitlearn: rename to scikit-learn
DavHau May 14, 2021
0a1a14d
python3Packages.scikit-learn: enable parallel building and testing
DavHau May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/development/jupyter/default.nix
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ in {
env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
ipykernel
pandas
scikitlearn
scikit-learn
]));
in {
displayName = "Python 3 for machine learning";
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/development/jupyterhub/default.nix
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ in {
env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
ipykernel
pandas
scikitlearn
scikit-learn
]));
in {
displayName = "Python 3 for machine learning";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/batchgenerators/default.nix
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
, numpy
, pillow
, scipy
, scikitlearn
, scikit-learn
, scikitimage
, threadpoolctl
}:
Expand All @@ -28,7 +28,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
future numpy pillow scipy scikit-learn scikitimage threadpoolctl
];

checkInputs = [ pytestCheckHook unittest2 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/bayesian-optimization/default.nix
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, python
, scikitlearn
, scikit-learn
, scipy
, pytest
, isPy27
Expand All @@ -21,7 +21,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
scikitlearn
scikit-learn
scipy
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/cnvkit/default.nix
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
, biopython
, numpy
, scipy
, scikitlearn
, scikit-learn
, pandas
, matplotlib
, reportlab
Expand Down Expand Up @@ -42,7 +42,7 @@ buildPythonPackage rec {
biopython
numpy
scipy
scikitlearn
scikit-learn
pandas
matplotlib
reportlab
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dask-glm/default.nix
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
, multipledispatch
, setuptools-scm
, scipy
, scikitlearn
, scikit-learn
, pytestCheckHook
}:

Expand All @@ -22,7 +22,7 @@ buildPythonPackage rec {

nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ];

meta = with lib; {
homepage = "https://github.com/dask/dask-glm/";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dask-ml/default.nix
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
, numpy, toolz # dask[array]
, numba
, pandas
, scikitlearn
, scikit-learn
, scipy
, dask-glm
, six
Expand Down Expand Up @@ -39,7 +39,7 @@ buildPythonPackage rec {
numpy
packaging
pandas
scikitlearn
scikit-learn
scipy
six
toolz
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dftfit/default.nix
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
, pandas
, scipy
, numpy
, scikitlearn
, scikit-learn
, lammps-cython
, pymatgen-lammps
, pytestrunner
Expand All @@ -34,7 +34,7 @@ buildPythonPackage rec {
pandas
scipy
numpy
scikitlearn
scikit-learn
lammps-cython
pymatgen-lammps
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/gensim/default.nix
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
, six
, scipy
, smart_open
, scikitlearn, testfixtures, unittest2
, scikit-learn, testfixtures, unittest2
, isPy3k
}:

Expand All @@ -21,7 +21,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ smart_open numpy six scipy ];

checkInputs = [ scikitlearn testfixtures unittest2 ];
checkInputs = [ scikit-learn testfixtures unittest2 ];

# Two tests fail.
#
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/graspologic/default.nix
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
, matplotlib
, networkx
, numpy
, scikitlearn
, scikit-learn
, scipy
, seaborn
}:
Expand All @@ -31,7 +31,7 @@ buildPythonPackage rec {
matplotlib
networkx
numpy
scikitlearn
scikit-learn
scipy
seaborn
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/hdbscan/default.nix
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
, numpy
, pytestCheckHook
, scipy
, scikitlearn
, scikit-learn
, fetchPypi
, joblib
, six
Expand All @@ -29,7 +29,7 @@ buildPythonPackage rec {
];

nativeBuildInputs = [ cython ];
propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];
propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ];
preCheck = ''
cd hdbscan/tests
rm __init__.py
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/hmmlearn/default.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }:
{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }:

buildPythonPackage rec {
pname = "hmmlearn";
Expand All @@ -10,7 +10,7 @@ buildPythonPackage rec {
};

buildInputs = [ setuptools_scm cython ];
propagatedBuildInputs = [ numpy scikitlearn ];
propagatedBuildInputs = [ numpy scikit-learn ];
checkInputs = [ pytest ];

checkPhase = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/hyppo/default.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
, fetchFromGitHub
, pytestCheckHook , pytestcov , numba
, numpy
, scikitlearn
, scikit-learn
, scipy
, matplotlib
, seaborn
Expand All @@ -26,7 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numba
numpy
scikitlearn
scikit-learn
scipy
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ignite/default.nix
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
, mock
, pytorch
, pynvml
, scikitlearn
, scikit-learn
, tqdm
}:

Expand All @@ -24,7 +24,7 @@ buildPythonPackage rec {
};

checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];
propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ];

# runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
doCheck = pythonOlder "3.9";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/imbalanced-learn/0.4.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
{ lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }:

buildPythonPackage rec {
pname = "imbalanced-learn";
Expand All @@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";
};

propagatedBuildInputs = [ scikitlearn ];
propagatedBuildInputs = [ scikit-learn ];
checkInputs = [ nose pytest pandas ];
checkPhase = ''
export HOME=$PWD
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/imbalanced-learn/default.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
, isPy27
, pandas
, pytestCheckHook
, scikitlearn
, scikit-learn
}:

buildPythonPackage rec {
Expand All @@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w";
};

propagatedBuildInputs = [ scikitlearn ];
propagatedBuildInputs = [ scikit-learn ];
checkInputs = [ pytestCheckHook pandas ];
preCheck = ''
export HOME=$TMPDIR
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/kmapper/default.nix
View file
Open in desktop
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, scikitlearn
, scikit-learn
, numpy
, scipy
, jinja2
Expand All @@ -25,7 +25,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
scikitlearn
scikit-learn
numpy
scipy
jinja2
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/librosa/default.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
, joblib
, matplotlib
, six
, scikitlearn
, scikit-learn
, decorator
, audioread
, resampy
Expand All @@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839";
};

propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ];
propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ];

# No tests
# 1. Internet connection is required
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/lightgbm/default.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
, cmake
, numpy
, scipy
, scikitlearn
, scikit-learn
, llvmPackages ? null
}:

Expand Down Expand Up @@ -39,7 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
scipy
scikitlearn
scikit-learn
];

postConfigure = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/mlrose/default.nix
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, scikitlearn
, scikit-learn
, pytestCheckHook
, pytest-randomly
}:
Expand All @@ -28,7 +28,7 @@ buildPythonPackage rec {
})
];

propagatedBuildInputs = [ scikitlearn ];
propagatedBuildInputs = [ scikit-learn ];
checkInputs = [ pytest-randomly pytestCheckHook ];

postPatch = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/mlxtend/default.nix
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
, pytestCheckHook
, scipy
, numpy
, scikitlearn
, scikit-learn
, pandas
, matplotlib
, joblib
Expand Down Expand Up @@ -33,7 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
scipy
numpy
scikitlearn
scikit-learn
pandas
matplotlib
joblib
Expand All @@ -45,7 +45,7 @@ buildPythonPackage rec {
license= licenses.bsd3;
maintainers = with maintainers; [ evax ];
platforms = platforms.unix;
# incompatible with nixpkgs scikitlearn version
# incompatible with nixpkgs scikit-learn version
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/mne-python/default.nix
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
, matplotlib
, nibabel
, pandas
, scikitlearn
, scikit-learn
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -40,7 +40,7 @@ buildPythonPackage rec {
matplotlib
nibabel
pandas
scikitlearn
scikit-learn
];
preCheck = ''
export HOME=$TMP
Expand Down