py-scikit-learn: updated to 0.21.2

Version 0.21.2
Changelog
sklearn.decomposition
Fix Fixed a bug in cross_decomposition.CCA improving numerical stability when Y is close to zero.

sklearn.metrics
Fix Fixed a bug in metrics.pairwise.euclidean_distances where a part of the distance matrix was left un-instanciated for suffiently large float32 datasets (regression introduced in 0.21).

sklearn.preprocessing
Fix Fixed a bug in preprocessing.OneHotEncoder where the new drop parameter was not reflected in get_feature_names.

sklearn.utils.sparsefuncs
Fix Fixed a bug where min_max_axis would fail on 32-bit systems for certain large inputs. This affects preprocessing.MaxAbsScaler, preprocessing.normalize and preprocessing.LabelBinarizer.


Version 0.21.1
This is a bug-fix release to primarily resolve some packaging issues in version 0.21.0. It also includes minor documentation improvements and some bug fixes.

Changelog
sklearn.metrics
Fix Fixed a bug in metrics.pairwise_distances where it would raise AttributeError for boolean metrics when X had a boolean dtype and Y == None.
Fix Fixed two bugs in metrics.pairwise_distances when n_jobs > 1. First it used to return a distance matrix with same dtype as input, even for integer dtype. Then the diagonal was not zeros for euclidean metric when Y is X.

sklearn.neighbors
Fix Fixed a bug in neighbors.KernelDensity which could not be restored from a pickle if sample_weight had been used.

Version 0.21.0
Changed models
The following estimators and functions, when fit with the same data and parameters, may produce different models from the previous version. This often occurs due to changes in the modelling logic (bug fixes or enhancements), or in random sampling procedures.
discriminant_analysis.LinearDiscriminantAnalysis for multiclass classification. Fix
discriminant_analysis.LinearDiscriminantAnalysis with ‘eigen’ solver. Fix
linear_model.BayesianRidge Fix
Decision trees and derived ensembles when both max_depth and max_leaf_nodes are set. Fix
linear_model.LogisticRegression and linear_model.LogisticRegressionCV with ‘saga’ solver. Fix
ensemble.GradientBoostingClassifier Fix
sklearn.feature_extraction.text.HashingVectorizer, sklearn.feature_extraction.text.TfidfVectorizer, and sklearn.feature_extraction.text.CountVectorizer Fix
neural_network.MLPClassifier Fix
svm.SVC.decision_function and multiclass.OneVsOneClassifier.decision_function. Fix
linear_model.SGDClassifier and any derived classifiers. Fix
Any model using the linear_model.sag.sag_solver function with a 0 seed, including linear_model.LogisticRegression, linear_model.LogisticRegressionCV, linear_model.Ridge, and linear_model.RidgeCV with ‘sag’ solver. Fix
linear_model.RidgeCV when using generalized cross-validation with sparse inputs

5 files changed, 228 insertions, 222 deletions

diff --git a/math/py-scikit-learn/Makefile b/math/py-scikit-learn/Makefile
index 8f624434484..cdb41be6a92 100644
--- a/math/py-scikit-learn/Makefile
+++ b/math/py-scikit-learn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2018/12/15 21:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/06/17 15:01:45 adam Exp $
 
-DISTNAME=	scikit-learn-0.20.0
+DISTNAME=	scikit-learn-0.21.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikit-learn/}
 
 MAINTAINER=	fhajny@NetBSD.org
@@ -10,16 +10,23 @@ HOMEPAGE=	http://scikit-learn.org/
 COMMENT=	Machine learning algorithms for Python
 LICENSE=	modified-bsd
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-joblib>=0.11:../../devel/py-joblib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+
+# XXX: OpenMP is not portable
+MAKE_ENV+=	SKLEARN_NO_OPENMP=1
 
 USE_LANGUAGES=	c c++ fortran
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+.include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .if !exists(/System/Library/Frameworks/Accelerate.framework)
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
 .endif
-BUILDLINK_API_DEPENDS.py-numpy+=	${PYPKGPREFIX}-numpy>=1.8.2
+BUILDLINK_API_DEPENDS.py-numpy+=	${PYPKGPREFIX}-numpy>=1.11.0
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-scikit-learn/PLIST b/math/py-scikit-learn/PLIST
index d0ffd4e1b0a..ed9ac748ce2 100644
--- a/math/py-scikit-learn/PLIST
+++ b/math/py-scikit-learn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/10/02 16:53:46 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/06/17 15:01:45 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -18,6 +18,9 @@ ${PYSITELIB}/sklearn/__init__.pyo
 ${PYSITELIB}/sklearn/_build_utils/__init__.py
 ${PYSITELIB}/sklearn/_build_utils/__init__.pyc
 ${PYSITELIB}/sklearn/_build_utils/__init__.pyo
+${PYSITELIB}/sklearn/_build_utils/openmp_helpers.py
+${PYSITELIB}/sklearn/_build_utils/openmp_helpers.pyc
+${PYSITELIB}/sklearn/_build_utils/openmp_helpers.pyo
 ${PYSITELIB}/sklearn/_config.py
 ${PYSITELIB}/sklearn/_config.pyc
 ${PYSITELIB}/sklearn/_config.pyo
@@ -59,6 +62,9 @@ ${PYSITELIB}/sklearn/cluster/k_means_.pyo
 ${PYSITELIB}/sklearn/cluster/mean_shift_.py
 ${PYSITELIB}/sklearn/cluster/mean_shift_.pyc
 ${PYSITELIB}/sklearn/cluster/mean_shift_.pyo
+${PYSITELIB}/sklearn/cluster/optics_.py
+${PYSITELIB}/sklearn/cluster/optics_.pyc
+${PYSITELIB}/sklearn/cluster/optics_.pyo
 ${PYSITELIB}/sklearn/cluster/setup.py
 ${PYSITELIB}/sklearn/cluster/setup.pyc
 ${PYSITELIB}/sklearn/cluster/setup.pyo
@@ -95,6 +101,9 @@ ${PYSITELIB}/sklearn/cluster/tests/test_k_means.pyo
 ${PYSITELIB}/sklearn/cluster/tests/test_mean_shift.py
 ${PYSITELIB}/sklearn/cluster/tests/test_mean_shift.pyc
 ${PYSITELIB}/sklearn/cluster/tests/test_mean_shift.pyo
+${PYSITELIB}/sklearn/cluster/tests/test_optics.py
+${PYSITELIB}/sklearn/cluster/tests/test_optics.pyc
+${PYSITELIB}/sklearn/cluster/tests/test_optics.pyo
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.py
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.pyc
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.pyo
@@ -116,6 +125,9 @@ ${PYSITELIB}/sklearn/compose/tests/test_column_transformer.pyo
 ${PYSITELIB}/sklearn/compose/tests/test_target.py
 ${PYSITELIB}/sklearn/compose/tests/test_target.pyc
 ${PYSITELIB}/sklearn/compose/tests/test_target.pyo
+${PYSITELIB}/sklearn/conftest.py
+${PYSITELIB}/sklearn/conftest.pyc
+${PYSITELIB}/sklearn/conftest.pyo
 ${PYSITELIB}/sklearn/covariance/__init__.py
 ${PYSITELIB}/sklearn/covariance/__init__.pyc
 ${PYSITELIB}/sklearn/covariance/__init__.pyo
@@ -212,9 +224,6 @@ ${PYSITELIB}/sklearn/datasets/kddcup99.pyo
 ${PYSITELIB}/sklearn/datasets/lfw.py
 ${PYSITELIB}/sklearn/datasets/lfw.pyc
 ${PYSITELIB}/sklearn/datasets/lfw.pyo
-${PYSITELIB}/sklearn/datasets/mlcomp.py
-${PYSITELIB}/sklearn/datasets/mlcomp.pyc
-${PYSITELIB}/sklearn/datasets/mlcomp.pyo
 ${PYSITELIB}/sklearn/datasets/mldata.py
 ${PYSITELIB}/sklearn/datasets/mldata.pyc
 ${PYSITELIB}/sklearn/datasets/mldata.pyo
@@ -242,10 +251,21 @@ ${PYSITELIB}/sklearn/datasets/svmlight_format.pyo
 ${PYSITELIB}/sklearn/datasets/tests/__init__.py
 ${PYSITELIB}/sklearn/datasets/tests/__init__.pyc
 ${PYSITELIB}/sklearn/datasets/tests/__init__.pyo
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1/api-v1-json-data-1.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1/api-v1-json-data-features-1.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1/api-v1-json-data-qualities-1.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1/data-v1-download-1.arff.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/api-v1-json-data-1119.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/api-v1-json-data-features-1119.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/api-v1-json-data-list-data_name-adult-census-limit-2-data_version-1.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/api-v1-json-data-list-data_name-adult-census-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/api-v1-json-data-qualities-1119.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/1119/data-v1-download-54002.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/2/api-v1-json-data-2.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/2/api-v1-json-data-features-2.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/2/api-v1-json-data-list-data_name-anneal-limit-2-data_version-1.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/2/api-v1-json-data-list-data_name-anneal-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/2/api-v1-json-data-qualities-2.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/2/data-v1-download-1666876.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-292.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-40981.json.gz
@@ -255,16 +275,22 @@ ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-list-data_n
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-list-data_name-australian-limit-2-data_version-1.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-list-data_name-australian-limit-2-status-active-.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/292/data-v1-download-49822.arff.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/3/api-v1-json-data-3.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/3/api-v1-json-data-features-3.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/3/api-v1-json-data-qualities-3.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/3/data-v1-download-3.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/api-v1-json-data-40589.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/api-v1-json-data-features-40589.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/api-v1-json-data-list-data_name-emotions-limit-2-data_version-3.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/api-v1-json-data-list-data_name-emotions-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/api-v1-json-data-qualities-40589.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40589/data-v1-download-4644182.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-40675.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-features-40675.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-list-data_name-glass2-limit-2-data_version-1-status-deactivated.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-list-data_name-glass2-limit-2-data_version-1.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-list-data_name-glass2-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/api-v1-json-data-qualities-40675.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40675/data-v1-download-4965250.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40945/api-v1-json-data-40945.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40945/api-v1-json-data-features-40945.json.gz
@@ -272,16 +298,19 @@ ${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-40966.jso
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-features-40966.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-list-data_name-miceprotein-limit-2-data_version-4.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-list-data_name-miceprotein-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-qualities-40966.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/data-v1-download-17928620.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/561/api-v1-json-data-561.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/561/api-v1-json-data-features-561.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/561/api-v1-json-data-list-data_name-cpu-limit-2-data_version-1.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/561/api-v1-json-data-list-data_name-cpu-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/561/api-v1-json-data-qualities-561.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/561/data-v1-download-52739.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/61/api-v1-json-data-61.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/61/api-v1-json-data-features-61.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/61/api-v1-json-data-list-data_name-iris-limit-2-data_version-1.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/61/api-v1-json-data-list-data_name-iris-limit-2-status-active-.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/61/api-v1-json-data-qualities-61.json.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/openml/61/data-v1-download-61.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/svmlight_classification.txt
 ${PYSITELIB}/sklearn/datasets/tests/data/svmlight_invalid.txt
@@ -409,7 +438,63 @@ ${PYSITELIB}/sklearn/dummy.pyo
 ${PYSITELIB}/sklearn/ensemble/__init__.py
 ${PYSITELIB}/sklearn/ensemble/__init__.pyc
 ${PYSITELIB}/sklearn/ensemble/__init__.pyo
+${PYSITELIB}/sklearn/ensemble/_gb_losses.py
+${PYSITELIB}/sklearn/ensemble/_gb_losses.pyc
+${PYSITELIB}/sklearn/ensemble/_gb_losses.pyo
 ${PYSITELIB}/sklearn/ensemble/_gradient_boosting.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/__init__.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/__init__.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/__init__.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/_binning.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/_gradient_boosting.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/_loss.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/_predictor.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/binning.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/binning.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/binning.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/grower.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/grower.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/grower.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/histogram.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/loss.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/loss.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/loss.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/predictor.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/predictor.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/predictor.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/splitting.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/__init__.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/__init__.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/__init__.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_binning.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_binning.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_binning.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_compare_lightgbm.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_compare_lightgbm.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_compare_lightgbm.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_gradient_boosting.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_gradient_boosting.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_gradient_boosting.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_grower.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_grower.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_grower.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_histogram.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_histogram.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_histogram.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_loss.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_loss.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_loss.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_predictor.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_predictor.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_predictor.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_splitting.py
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_splitting.pyc
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/tests/test_splitting.pyo
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/types.so
+${PYSITELIB}/sklearn/ensemble/_hist_gradient_boosting/utils.so
 ${PYSITELIB}/sklearn/ensemble/bagging.py
 ${PYSITELIB}/sklearn/ensemble/bagging.pyc
 ${PYSITELIB}/sklearn/ensemble/bagging.pyo
@@ -455,21 +540,39 @@ ${PYSITELIB}/sklearn/ensemble/tests/test_iforest.pyo
 ${PYSITELIB}/sklearn/ensemble/tests/test_partial_dependence.py
 ${PYSITELIB}/sklearn/ensemble/tests/test_partial_dependence.pyc
 ${PYSITELIB}/sklearn/ensemble/tests/test_partial_dependence.pyo
-${PYSITELIB}/sklearn/ensemble/tests/test_voting_classifier.py
-${PYSITELIB}/sklearn/ensemble/tests/test_voting_classifier.pyc
-${PYSITELIB}/sklearn/ensemble/tests/test_voting_classifier.pyo
+${PYSITELIB}/sklearn/ensemble/tests/test_voting.py
+${PYSITELIB}/sklearn/ensemble/tests/test_voting.pyc
+${PYSITELIB}/sklearn/ensemble/tests/test_voting.pyo
 ${PYSITELIB}/sklearn/ensemble/tests/test_weight_boosting.py
 ${PYSITELIB}/sklearn/ensemble/tests/test_weight_boosting.pyc
 ${PYSITELIB}/sklearn/ensemble/tests/test_weight_boosting.pyo
-${PYSITELIB}/sklearn/ensemble/voting_classifier.py
-${PYSITELIB}/sklearn/ensemble/voting_classifier.pyc
-${PYSITELIB}/sklearn/ensemble/voting_classifier.pyo
+${PYSITELIB}/sklearn/ensemble/voting.py
+${PYSITELIB}/sklearn/ensemble/voting.pyc
+${PYSITELIB}/sklearn/ensemble/voting.pyo
 ${PYSITELIB}/sklearn/ensemble/weight_boosting.py
 ${PYSITELIB}/sklearn/ensemble/weight_boosting.pyc
 ${PYSITELIB}/sklearn/ensemble/weight_boosting.pyo
 ${PYSITELIB}/sklearn/exceptions.py
 ${PYSITELIB}/sklearn/exceptions.pyc
 ${PYSITELIB}/sklearn/exceptions.pyo
+${PYSITELIB}/sklearn/experimental/__init__.py
+${PYSITELIB}/sklearn/experimental/__init__.pyc
+${PYSITELIB}/sklearn/experimental/__init__.pyo
+${PYSITELIB}/sklearn/experimental/enable_hist_gradient_boosting.py
+${PYSITELIB}/sklearn/experimental/enable_hist_gradient_boosting.pyc
+${PYSITELIB}/sklearn/experimental/enable_hist_gradient_boosting.pyo
+${PYSITELIB}/sklearn/experimental/enable_iterative_imputer.py
+${PYSITELIB}/sklearn/experimental/enable_iterative_imputer.pyc
+${PYSITELIB}/sklearn/experimental/enable_iterative_imputer.pyo
+${PYSITELIB}/sklearn/experimental/tests/__init__.py
+${PYSITELIB}/sklearn/experimental/tests/__init__.pyc
+${PYSITELIB}/sklearn/experimental/tests/__init__.pyo
+${PYSITELIB}/sklearn/experimental/tests/test_enable_hist_gradient_boosting.py
+${PYSITELIB}/sklearn/experimental/tests/test_enable_hist_gradient_boosting.pyc
+${PYSITELIB}/sklearn/experimental/tests/test_enable_hist_gradient_boosting.pyo
+${PYSITELIB}/sklearn/experimental/tests/test_enable_iterative_imputer.py
+${PYSITELIB}/sklearn/experimental/tests/test_enable_iterative_imputer.pyc
+${PYSITELIB}/sklearn/experimental/tests/test_enable_iterative_imputer.pyo
 ${PYSITELIB}/sklearn/externals/__init__.py
 ${PYSITELIB}/sklearn/externals/__init__.pyc
 ${PYSITELIB}/sklearn/externals/__init__.pyo
@@ -482,168 +585,12 @@ ${PYSITELIB}/sklearn/externals/_pilutil.pyo
 ${PYSITELIB}/sklearn/externals/conftest.py
 ${PYSITELIB}/sklearn/externals/conftest.pyc
 ${PYSITELIB}/sklearn/externals/conftest.pyo
-${PYSITELIB}/sklearn/externals/funcsigs.py
-${PYSITELIB}/sklearn/externals/funcsigs.pyc
-${PYSITELIB}/sklearn/externals/funcsigs.pyo
 ${PYSITELIB}/sklearn/externals/joblib/__init__.py
 ${PYSITELIB}/sklearn/externals/joblib/__init__.pyc
 ${PYSITELIB}/sklearn/externals/joblib/__init__.pyo
-${PYSITELIB}/sklearn/externals/joblib/_compat.py
-${PYSITELIB}/sklearn/externals/joblib/_compat.pyc
-${PYSITELIB}/sklearn/externals/joblib/_compat.pyo
-${PYSITELIB}/sklearn/externals/joblib/_dask.py
-${PYSITELIB}/sklearn/externals/joblib/_dask.pyc
-${PYSITELIB}/sklearn/externals/joblib/_dask.pyo
-${PYSITELIB}/sklearn/externals/joblib/_memmapping_reducer.py
-${PYSITELIB}/sklearn/externals/joblib/_memmapping_reducer.pyc
-${PYSITELIB}/sklearn/externals/joblib/_memmapping_reducer.pyo
-${PYSITELIB}/sklearn/externals/joblib/_memory_helpers.py
-${PYSITELIB}/sklearn/externals/joblib/_memory_helpers.pyc
-${PYSITELIB}/sklearn/externals/joblib/_memory_helpers.pyo
-${PYSITELIB}/sklearn/externals/joblib/_multiprocessing_helpers.py
-${PYSITELIB}/sklearn/externals/joblib/_multiprocessing_helpers.pyc
-${PYSITELIB}/sklearn/externals/joblib/_multiprocessing_helpers.pyo
-${PYSITELIB}/sklearn/externals/joblib/_parallel_backends.py
-${PYSITELIB}/sklearn/externals/joblib/_parallel_backends.pyc
-${PYSITELIB}/sklearn/externals/joblib/_parallel_backends.pyo
-${PYSITELIB}/sklearn/externals/joblib/_store_backends.py
-${PYSITELIB}/sklearn/externals/joblib/_store_backends.pyc
-${PYSITELIB}/sklearn/externals/joblib/_store_backends.pyo
-${PYSITELIB}/sklearn/externals/joblib/backports.py
-${PYSITELIB}/sklearn/externals/joblib/backports.pyc
-${PYSITELIB}/sklearn/externals/joblib/backports.pyo
-${PYSITELIB}/sklearn/externals/joblib/compressor.py
-${PYSITELIB}/sklearn/externals/joblib/compressor.pyc
-${PYSITELIB}/sklearn/externals/joblib/compressor.pyo
-${PYSITELIB}/sklearn/externals/joblib/disk.py
-${PYSITELIB}/sklearn/externals/joblib/disk.pyc
-${PYSITELIB}/sklearn/externals/joblib/disk.pyo
-${PYSITELIB}/sklearn/externals/joblib/executor.py
-${PYSITELIB}/sklearn/externals/joblib/executor.pyc
-${PYSITELIB}/sklearn/externals/joblib/executor.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/__init__.py
-${PYSITELIB}/sklearn/externals/joblib/externals/__init__.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/__init__.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/__init__.py
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/__init__.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/__init__.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/cloudpickle.py
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/cloudpickle.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/cloudpickle/cloudpickle.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/__init__.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/__init__.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/__init__.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/_base.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/_base.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/_base.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/__init__.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/__init__.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/__init__.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_reduction.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_reduction.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_reduction.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_wait.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_wait.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_posix_wait.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_reduction.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_reduction.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_reduction.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_wait.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_wait.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/_win_wait.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_posix.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_posix.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_posix.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_win32.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_win32.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/compat_win32.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/context.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/context.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/context.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/fork_exec.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/fork_exec.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/fork_exec.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/managers.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/managers.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/managers.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_posix.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_posix.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_posix.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_win32.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_win32.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/popen_loky_win32.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/process.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/process.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/process.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/queues.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/queues.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/queues.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/reduction.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/reduction.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/reduction.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semaphore_tracker.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semaphore_tracker.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semaphore_tracker.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semlock.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semlock.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/semlock.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/spawn.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/spawn.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/spawn.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/synchronize.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/synchronize.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/synchronize.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/utils.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/utils.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/backend/utils.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/cloudpickle_wrapper.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/cloudpickle_wrapper.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/cloudpickle_wrapper.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/process_executor.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/process_executor.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/process_executor.pyo
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/reusable_executor.py
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/reusable_executor.pyc
-${PYSITELIB}/sklearn/externals/joblib/externals/loky/reusable_executor.pyo
-${PYSITELIB}/sklearn/externals/joblib/format_stack.py
-${PYSITELIB}/sklearn/externals/joblib/format_stack.pyc
-${PYSITELIB}/sklearn/externals/joblib/format_stack.pyo
-${PYSITELIB}/sklearn/externals/joblib/func_inspect.py
-${PYSITELIB}/sklearn/externals/joblib/func_inspect.pyc
-${PYSITELIB}/sklearn/externals/joblib/func_inspect.pyo
-${PYSITELIB}/sklearn/externals/joblib/hashing.py
-${PYSITELIB}/sklearn/externals/joblib/hashing.pyc
-${PYSITELIB}/sklearn/externals/joblib/hashing.pyo
-${PYSITELIB}/sklearn/externals/joblib/logger.py
-${PYSITELIB}/sklearn/externals/joblib/logger.pyc
-${PYSITELIB}/sklearn/externals/joblib/logger.pyo
-${PYSITELIB}/sklearn/externals/joblib/memory.py
-${PYSITELIB}/sklearn/externals/joblib/memory.pyc
-${PYSITELIB}/sklearn/externals/joblib/memory.pyo
-${PYSITELIB}/sklearn/externals/joblib/my_exceptions.py
-${PYSITELIB}/sklearn/externals/joblib/my_exceptions.pyc
-${PYSITELIB}/sklearn/externals/joblib/my_exceptions.pyo
 ${PYSITELIB}/sklearn/externals/joblib/numpy_pickle.py
 ${PYSITELIB}/sklearn/externals/joblib/numpy_pickle.pyc
 ${PYSITELIB}/sklearn/externals/joblib/numpy_pickle.pyo
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_compat.py
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_compat.pyc
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_compat.pyo
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_utils.py
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_utils.pyc
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle_utils.pyo
-${PYSITELIB}/sklearn/externals/joblib/parallel.py
-${PYSITELIB}/sklearn/externals/joblib/parallel.pyc
-${PYSITELIB}/sklearn/externals/joblib/parallel.pyo
-${PYSITELIB}/sklearn/externals/joblib/pool.py
-${PYSITELIB}/sklearn/externals/joblib/pool.pyc
-${PYSITELIB}/sklearn/externals/joblib/pool.pyo
-${PYSITELIB}/sklearn/externals/joblib/testing.py
-${PYSITELIB}/sklearn/externals/joblib/testing.pyc
-${PYSITELIB}/sklearn/externals/joblib/testing.pyo
 ${PYSITELIB}/sklearn/externals/setup.py
 ${PYSITELIB}/sklearn/externals/setup.pyc
 ${PYSITELIB}/sklearn/externals/setup.pyo
@@ -762,9 +709,33 @@ ${PYSITELIB}/sklearn/gaussian_process/tests/test_gpr.pyo
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_kernels.py
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_kernels.pyc
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_kernels.pyo
-${PYSITELIB}/sklearn/impute.py
-${PYSITELIB}/sklearn/impute.pyc
-${PYSITELIB}/sklearn/impute.pyo
+${PYSITELIB}/sklearn/impute/__init__.py
+${PYSITELIB}/sklearn/impute/__init__.pyc
+${PYSITELIB}/sklearn/impute/__init__.pyo
+${PYSITELIB}/sklearn/impute/_base.py
+${PYSITELIB}/sklearn/impute/_base.pyc
+${PYSITELIB}/sklearn/impute/_base.pyo
+${PYSITELIB}/sklearn/impute/_iterative.py
+${PYSITELIB}/sklearn/impute/_iterative.pyc
+${PYSITELIB}/sklearn/impute/_iterative.pyo
+${PYSITELIB}/sklearn/impute/tests/__init__.py
+${PYSITELIB}/sklearn/impute/tests/__init__.pyc
+${PYSITELIB}/sklearn/impute/tests/__init__.pyo
+${PYSITELIB}/sklearn/impute/tests/test_impute.py
+${PYSITELIB}/sklearn/impute/tests/test_impute.pyc
+${PYSITELIB}/sklearn/impute/tests/test_impute.pyo
+${PYSITELIB}/sklearn/inspection/__init__.py
+${PYSITELIB}/sklearn/inspection/__init__.pyc
+${PYSITELIB}/sklearn/inspection/__init__.pyo
+${PYSITELIB}/sklearn/inspection/partial_dependence.py
+${PYSITELIB}/sklearn/inspection/partial_dependence.pyc
+${PYSITELIB}/sklearn/inspection/partial_dependence.pyo
+${PYSITELIB}/sklearn/inspection/tests/__init__.py
+${PYSITELIB}/sklearn/inspection/tests/__init__.pyc
+${PYSITELIB}/sklearn/inspection/tests/__init__.pyo
+${PYSITELIB}/sklearn/inspection/tests/test_partial_dependence.py
+${PYSITELIB}/sklearn/inspection/tests/test_partial_dependence.pyc
+${PYSITELIB}/sklearn/inspection/tests/test_partial_dependence.pyo
 ${PYSITELIB}/sklearn/isotonic.py
 ${PYSITELIB}/sklearn/isotonic.pyc
 ${PYSITELIB}/sklearn/isotonic.pyo
@@ -805,9 +776,6 @@ ${PYSITELIB}/sklearn/linear_model/passive_aggressive.pyo
 ${PYSITELIB}/sklearn/linear_model/perceptron.py
 ${PYSITELIB}/sklearn/linear_model/perceptron.pyc
 ${PYSITELIB}/sklearn/linear_model/perceptron.pyo
-${PYSITELIB}/sklearn/linear_model/randomized_l1.py
-${PYSITELIB}/sklearn/linear_model/randomized_l1.pyc
-${PYSITELIB}/sklearn/linear_model/randomized_l1.pyo
 ${PYSITELIB}/sklearn/linear_model/ransac.py
 ${PYSITELIB}/sklearn/linear_model/ransac.pyc
 ${PYSITELIB}/sklearn/linear_model/ransac.pyo
@@ -855,9 +823,6 @@ ${PYSITELIB}/sklearn/linear_model/tests/test_passive_aggressive.pyo
 ${PYSITELIB}/sklearn/linear_model/tests/test_perceptron.py
 ${PYSITELIB}/sklearn/linear_model/tests/test_perceptron.pyc
 ${PYSITELIB}/sklearn/linear_model/tests/test_perceptron.pyo
-${PYSITELIB}/sklearn/linear_model/tests/test_randomized_l1.py
-${PYSITELIB}/sklearn/linear_model/tests/test_randomized_l1.pyc
-${PYSITELIB}/sklearn/linear_model/tests/test_randomized_l1.pyo
 ${PYSITELIB}/sklearn/linear_model/tests/test_ransac.py
 ${PYSITELIB}/sklearn/linear_model/tests/test_ransac.pyc
 ${PYSITELIB}/sklearn/linear_model/tests/test_ransac.pyo
@@ -1060,9 +1025,6 @@ ${PYSITELIB}/sklearn/naive_bayes.pyo
 ${PYSITELIB}/sklearn/neighbors/__init__.py
 ${PYSITELIB}/sklearn/neighbors/__init__.pyc
 ${PYSITELIB}/sklearn/neighbors/__init__.pyo
-${PYSITELIB}/sklearn/neighbors/approximate.py
-${PYSITELIB}/sklearn/neighbors/approximate.pyc
-${PYSITELIB}/sklearn/neighbors/approximate.pyo
 ${PYSITELIB}/sklearn/neighbors/ball_tree.so
 ${PYSITELIB}/sklearn/neighbors/base.py
 ${PYSITELIB}/sklearn/neighbors/base.pyc
@@ -1081,6 +1043,9 @@ ${PYSITELIB}/sklearn/neighbors/kde.pyo
 ${PYSITELIB}/sklearn/neighbors/lof.py
 ${PYSITELIB}/sklearn/neighbors/lof.pyc
 ${PYSITELIB}/sklearn/neighbors/lof.pyo
+${PYSITELIB}/sklearn/neighbors/nca.py
+${PYSITELIB}/sklearn/neighbors/nca.pyc
+${PYSITELIB}/sklearn/neighbors/nca.pyo
 ${PYSITELIB}/sklearn/neighbors/nearest_centroid.py
 ${PYSITELIB}/sklearn/neighbors/nearest_centroid.pyc
 ${PYSITELIB}/sklearn/neighbors/nearest_centroid.pyo
@@ -1094,9 +1059,6 @@ ${PYSITELIB}/sklearn/neighbors/setup.pyo
 ${PYSITELIB}/sklearn/neighbors/tests/__init__.py
 ${PYSITELIB}/sklearn/neighbors/tests/__init__.pyc
 ${PYSITELIB}/sklearn/neighbors/tests/__init__.pyo
-${PYSITELIB}/sklearn/neighbors/tests/test_approximate.py
-${PYSITELIB}/sklearn/neighbors/tests/test_approximate.pyc
-${PYSITELIB}/sklearn/neighbors/tests/test_approximate.pyo
 ${PYSITELIB}/sklearn/neighbors/tests/test_ball_tree.py
 ${PYSITELIB}/sklearn/neighbors/tests/test_ball_tree.pyc
 ${PYSITELIB}/sklearn/neighbors/tests/test_ball_tree.pyo
@@ -1112,6 +1074,9 @@ ${PYSITELIB}/sklearn/neighbors/tests/test_kde.pyo
 ${PYSITELIB}/sklearn/neighbors/tests/test_lof.py
 ${PYSITELIB}/sklearn/neighbors/tests/test_lof.pyc
 ${PYSITELIB}/sklearn/neighbors/tests/test_lof.pyo
+${PYSITELIB}/sklearn/neighbors/tests/test_nca.py
+${PYSITELIB}/sklearn/neighbors/tests/test_nca.pyc
+${PYSITELIB}/sklearn/neighbors/tests/test_nca.pyo
 ${PYSITELIB}/sklearn/neighbors/tests/test_nearest_centroid.py
 ${PYSITELIB}/sklearn/neighbors/tests/test_nearest_centroid.pyc
 ${PYSITELIB}/sklearn/neighbors/tests/test_nearest_centroid.pyo
@@ -1158,6 +1123,7 @@ ${PYSITELIB}/sklearn/pipeline.pyo
 ${PYSITELIB}/sklearn/preprocessing/__init__.py
 ${PYSITELIB}/sklearn/preprocessing/__init__.pyc
 ${PYSITELIB}/sklearn/preprocessing/__init__.pyo
+${PYSITELIB}/sklearn/preprocessing/_csr_polynomial_expansion.so
 ${PYSITELIB}/sklearn/preprocessing/_discretization.py
 ${PYSITELIB}/sklearn/preprocessing/_discretization.pyc
 ${PYSITELIB}/sklearn/preprocessing/_discretization.pyo
@@ -1179,6 +1145,9 @@ ${PYSITELIB}/sklearn/preprocessing/imputation.pyo
 ${PYSITELIB}/sklearn/preprocessing/label.py
 ${PYSITELIB}/sklearn/preprocessing/label.pyc
 ${PYSITELIB}/sklearn/preprocessing/label.pyo
+${PYSITELIB}/sklearn/preprocessing/setup.py
+${PYSITELIB}/sklearn/preprocessing/setup.pyc
+${PYSITELIB}/sklearn/preprocessing/setup.pyo
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.py
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.pyc
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.pyo
@@ -1281,9 +1250,6 @@ ${PYSITELIB}/sklearn/tests/test_docstring_parameters.pyo
 ${PYSITELIB}/sklearn/tests/test_dummy.py
 ${PYSITELIB}/sklearn/tests/test_dummy.pyc
 ${PYSITELIB}/sklearn/tests/test_dummy.pyo
-${PYSITELIB}/sklearn/tests/test_impute.py
-${PYSITELIB}/sklearn/tests/test_impute.pyc
-${PYSITELIB}/sklearn/tests/test_impute.pyo
 ${PYSITELIB}/sklearn/tests/test_init.py
 ${PYSITELIB}/sklearn/tests/test_init.pyc
 ${PYSITELIB}/sklearn/tests/test_init.pyo
@@ -1320,9 +1286,16 @@ ${PYSITELIB}/sklearn/tests/test_site_joblib.pyo
 ${PYSITELIB}/sklearn/tree/__init__.py
 ${PYSITELIB}/sklearn/tree/__init__.pyc
 ${PYSITELIB}/sklearn/tree/__init__.pyo
+${PYSITELIB}/sklearn/tree/_criterion.pxd
 ${PYSITELIB}/sklearn/tree/_criterion.so
+${PYSITELIB}/sklearn/tree/_reingold_tilford.py
+${PYSITELIB}/sklearn/tree/_reingold_tilford.pyc
+${PYSITELIB}/sklearn/tree/_reingold_tilford.pyo
+${PYSITELIB}/sklearn/tree/_splitter.pxd
 ${PYSITELIB}/sklearn/tree/_splitter.so
+${PYSITELIB}/sklearn/tree/_tree.pxd
 ${PYSITELIB}/sklearn/tree/_tree.so
+${PYSITELIB}/sklearn/tree/_utils.pxd
 ${PYSITELIB}/sklearn/tree/_utils.so
 ${PYSITELIB}/sklearn/tree/export.py
 ${PYSITELIB}/sklearn/tree/export.pyc
@@ -1336,6 +1309,9 @@ ${PYSITELIB}/sklearn/tree/tests/__init__.pyo
 ${PYSITELIB}/sklearn/tree/tests/test_export.py
 ${PYSITELIB}/sklearn/tree/tests/test_export.pyc
 ${PYSITELIB}/sklearn/tree/tests/test_export.pyo
+${PYSITELIB}/sklearn/tree/tests/test_reingold_tilford.py
+${PYSITELIB}/sklearn/tree/tests/test_reingold_tilford.pyc
+${PYSITELIB}/sklearn/tree/tests/test_reingold_tilford.pyo
 ${PYSITELIB}/sklearn/tree/tests/test_tree.py
 ${PYSITELIB}/sklearn/tree/tests/test_tree.pyc
 ${PYSITELIB}/sklearn/tree/tests/test_tree.pyo
@@ -1345,27 +1321,22 @@ ${PYSITELIB}/sklearn/tree/tree.pyo
 ${PYSITELIB}/sklearn/utils/__init__.py
 ${PYSITELIB}/sklearn/utils/__init__.pyc
 ${PYSITELIB}/sklearn/utils/__init__.pyo
+${PYSITELIB}/sklearn/utils/_cython_blas.so
 ${PYSITELIB}/sklearn/utils/_joblib.py
 ${PYSITELIB}/sklearn/utils/_joblib.pyc
 ${PYSITELIB}/sklearn/utils/_joblib.pyo
 ${PYSITELIB}/sklearn/utils/_logistic_sigmoid.so
+${PYSITELIB}/sklearn/utils/_pprint.py
+${PYSITELIB}/sklearn/utils/_pprint.pyc
+${PYSITELIB}/sklearn/utils/_pprint.pyo
 ${PYSITELIB}/sklearn/utils/_random.so
-${PYSITELIB}/sklearn/utils/_scipy_sparse_lsqr_backport.py
-${PYSITELIB}/sklearn/utils/_scipy_sparse_lsqr_backport.pyc
-${PYSITELIB}/sklearn/utils/_scipy_sparse_lsqr_backport.pyo
 ${PYSITELIB}/sklearn/utils/_show_versions.py
 ${PYSITELIB}/sklearn/utils/_show_versions.pyc
 ${PYSITELIB}/sklearn/utils/_show_versions.pyo
 ${PYSITELIB}/sklearn/utils/_unittest_backport.py
 ${PYSITELIB}/sklearn/utils/_unittest_backport.pyc
 ${PYSITELIB}/sklearn/utils/_unittest_backport.pyo
-${PYSITELIB}/sklearn/utils/arpack.py
-${PYSITELIB}/sklearn/utils/arpack.pyc
-${PYSITELIB}/sklearn/utils/arpack.pyo
 ${PYSITELIB}/sklearn/utils/arrayfuncs.so
-${PYSITELIB}/sklearn/utils/bench.py
-${PYSITELIB}/sklearn/utils/bench.pyc
-${PYSITELIB}/sklearn/utils/bench.pyo
 ${PYSITELIB}/sklearn/utils/class_weight.py
 ${PYSITELIB}/sklearn/utils/class_weight.pyc
 ${PYSITELIB}/sklearn/utils/class_weight.pyo
@@ -1414,15 +1385,6 @@ ${PYSITELIB}/sklearn/utils/sparsefuncs.py
 ${PYSITELIB}/sklearn/utils/sparsefuncs.pyc
 ${PYSITELIB}/sklearn/utils/sparsefuncs.pyo
 ${PYSITELIB}/sklearn/utils/sparsefuncs_fast.so
-${PYSITELIB}/sklearn/utils/sparsetools/__init__.py
-${PYSITELIB}/sklearn/utils/sparsetools/__init__.pyc
-${PYSITELIB}/sklearn/utils/sparsetools/__init__.pyo
-${PYSITELIB}/sklearn/utils/sparsetools/setup.py
-${PYSITELIB}/sklearn/utils/sparsetools/setup.pyc
-${PYSITELIB}/sklearn/utils/sparsetools/setup.pyo
-${PYSITELIB}/sklearn/utils/sparsetools/tests/__init__.py
-${PYSITELIB}/sklearn/utils/sparsetools/tests/__init__.pyc
-${PYSITELIB}/sklearn/utils/sparsetools/tests/__init__.pyo
 ${PYSITELIB}/sklearn/utils/stats.py
 ${PYSITELIB}/sklearn/utils/stats.pyc
 ${PYSITELIB}/sklearn/utils/stats.pyo
@@ -1432,12 +1394,12 @@ ${PYSITELIB}/sklearn/utils/testing.pyo
 ${PYSITELIB}/sklearn/utils/tests/__init__.py
 ${PYSITELIB}/sklearn/utils/tests/__init__.pyc
 ${PYSITELIB}/sklearn/utils/tests/__init__.pyo
-${PYSITELIB}/sklearn/utils/tests/test_bench.py
-${PYSITELIB}/sklearn/utils/tests/test_bench.pyc
-${PYSITELIB}/sklearn/utils/tests/test_bench.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_class_weight.py
 ${PYSITELIB}/sklearn/utils/tests/test_class_weight.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_class_weight.pyo
+${PYSITELIB}/sklearn/utils/tests/test_cython_blas.py
+${PYSITELIB}/sklearn/utils/tests/test_cython_blas.pyc
+${PYSITELIB}/sklearn/utils/tests/test_cython_blas.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_deprecation.py
 ${PYSITELIB}/sklearn/utils/tests/test_deprecation.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_deprecation.pyo
@@ -1453,9 +1415,6 @@ ${PYSITELIB}/sklearn/utils/tests/test_fast_dict.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_fixes.py
 ${PYSITELIB}/sklearn/utils/tests/test_fixes.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_fixes.pyo
-${PYSITELIB}/sklearn/utils/tests/test_graph.py
-${PYSITELIB}/sklearn/utils/tests/test_graph.pyc
-${PYSITELIB}/sklearn/utils/tests/test_graph.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_linear_assignment.py
 ${PYSITELIB}/sklearn/utils/tests/test_linear_assignment.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_linear_assignment.pyo
@@ -1471,6 +1430,9 @@ ${PYSITELIB}/sklearn/utils/tests/test_murmurhash.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_optimize.py
 ${PYSITELIB}/sklearn/utils/tests/test_optimize.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_optimize.pyo
+${PYSITELIB}/sklearn/utils/tests/test_pprint.py
+${PYSITELIB}/sklearn/utils/tests/test_pprint.pyc
+${PYSITELIB}/sklearn/utils/tests/test_pprint.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_random.py
 ${PYSITELIB}/sklearn/utils/tests/test_random.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_random.pyo
@@ -1486,9 +1448,6 @@ ${PYSITELIB}/sklearn/utils/tests/test_show_versions.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_sparsefuncs.py
 ${PYSITELIB}/sklearn/utils/tests/test_sparsefuncs.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_sparsefuncs.pyo
-${PYSITELIB}/sklearn/utils/tests/test_stats.py
-${PYSITELIB}/sklearn/utils/tests/test_stats.pyc
-${PYSITELIB}/sklearn/utils/tests/test_stats.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_testing.py
 ${PYSITELIB}/sklearn/utils/tests/test_testing.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_testing.pyo
diff --git a/math/py-scikit-learn/distinfo b/math/py-scikit-learn/distinfo
index d4d35311abd..0eb47e33b16 100644
--- a/math/py-scikit-learn/distinfo
+++ b/math/py-scikit-learn/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2018/10/02 16:53:46 minskim Exp $
+$NetBSD: distinfo,v 1.6 2019/06/17 15:01:45 adam Exp $
 
-SHA1 (scikit-learn-0.20.0.tar.gz) = abc1d6ff7f2a682183a01fba664eb931efaebdfc
-RMD160 (scikit-learn-0.20.0.tar.gz) = d7fea3a02266d5080e495466b4e2351e46b426ad
-SHA512 (scikit-learn-0.20.0.tar.gz) = f01fb0846e6e778fe6ab575f420143f04c6d35ac860b1b5e6f2a3a1a3be3e8e7ca7e20ec0995eeea80194d18c104f6cb776aadfd9c75cd3fca55b0926faee9c9
-Size (scikit-learn-0.20.0.tar.gz) = 28061776 bytes
+SHA1 (scikit-learn-0.21.2.tar.gz) = 43b3421f73178e30a6f20417d3d5c33f08bf450a
+RMD160 (scikit-learn-0.21.2.tar.gz) = 60bfa841e1863bc8f5c3c14338e35e57a9f45e76
+SHA512 (scikit-learn-0.21.2.tar.gz) = c1fb512b2dac80765087450d48f38bebdebb127dc53e36a85251d4afb509cd4436a6fb90d89efc224697ff804f45f27b6bffb32ff1619c3e05bd4e440a275a85
+Size (scikit-learn-0.21.2.tar.gz) = 12238398 bytes
+SHA1 (patch-setup.py) = 9a3a0a190f947ec98291534e179587db24f5c5d6
+SHA1 (patch-sklearn_ensemble____hist__gradient__boosting_splitting.c) = 53b3d222c135e8a5ae60311af076460fe0a27b56
diff --git a/math/py-scikit-learn/patches/patch-setup.py b/math/py-scikit-learn/patches/patch-setup.py
new file mode 100644
index 00000000000..031acaace03
--- /dev/null
+++ b/math/py-scikit-learn/patches/patch-setup.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2019/06/17 15:01:45 adam Exp $
+
+Enable 'test' command.
+
+--- setup.py.orig	2019-06-17 08:28:08.000000000 +0000
++++ setup.py
+@@ -65,6 +65,7 @@ SETUPTOOLS_COMMANDS = {
+     'bdist_wininst', 'install_egg_info', 'build_sphinx',
+     'egg_info', 'easy_install', 'upload', 'bdist_wheel',
+     '--single-version-externally-managed',
++    'test'
+ }
+ if SETUPTOOLS_COMMANDS.intersection(sys.argv):
+     import setuptools
diff --git a/math/py-scikit-learn/patches/patch-sklearn_ensemble____hist__gradient__boosting_splitting.c b/math/py-scikit-learn/patches/patch-sklearn_ensemble____hist__gradient__boosting_splitting.c
new file mode 100644
index 00000000000..c2d70de43e3
--- /dev/null
+++ b/math/py-scikit-learn/patches/patch-sklearn_ensemble____hist__gradient__boosting_splitting.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-sklearn_ensemble____hist__gradient__boosting_splitting.c,v 1.1 2019/06/17 15:01:45 adam Exp $
+
+Fix building without OpenMP.
+
+--- sklearn/ensemble/_hist_gradient_boosting/splitting.c.orig	2019-05-24 03:32:38.000000000 +0000
++++ sklearn/ensemble/_hist_gradient_boosting/splitting.c
+@@ -611,7 +611,6 @@ static CYTHON_INLINE float __PYX_NAN() {
+ #include <stdio.h>
+ #include "numpy/arrayobject.h"
+ #include "numpy/ufuncobject.h"
+-#include <omp.h>
+ #include <stdlib.h>
+ #include "pythread.h"
+ #include "pystate.h"
+@@ -3810,7 +3809,9 @@ __pyx_v_X_binned = __pyx_t_4;
+  *             ELSE:
+  *                 int n_threads = 1
+  */
++#ifdef _OPENMP
+   __pyx_v_n_threads = omp_get_max_threads();
++#endif
+ 
+   /* "sklearn/ensemble/_hist_gradient_boosting/splitting.pyx":249
+  *                 int n_threads = 1