math/py-scikit-learn: Update to 0.20.0

Highlights:

Missing values in features, represented by NaNs, are now accepted in
column-wise preprocessing such as scalers. Each feature is fitted
disregarding NaNs, and data containing NaNs can be transformed. The
new impute module provides estimators for learning despite missing
data.

ColumnTransformer handles the case where different features or columns
of a pandas.DataFrame need different preprocessing. String or pandas
Categorical columns can now be encoded with OneHotEncoder or
OrdinalEncoder.

TransformedTargetRegressor helps when the regression target needs to
be transformed to be modeled. PowerTransformer and KBinsDiscretizer
join QuantileTransformer as non-linear transformations.

Added sample_weight support to several estimators (including KMeans,
BayesianRidge and KernelDensity) and improved stopping criteria in
others (including MLPRegressor, GradientBoostingRegressor and
SGDRegressor).

This release is also the first to be accompanied by a Glossary of
Common Terms and API Elements.

3 files changed, 277 insertions, 64 deletions

diff --git a/math/py-scikit-learn/Makefile b/math/py-scikit-learn/Makefile
index 85c264c8db5..74d26bcd934 100644
--- a/math/py-scikit-learn/Makefile
+++ b/math/py-scikit-learn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/08/06 16:18:12 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2018/10/02 16:53:46 minskim Exp $
 
-DISTNAME=	scikit-learn-0.19.2
+DISTNAME=	scikit-learn-0.20.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikit-learn/}
diff --git a/math/py-scikit-learn/PLIST b/math/py-scikit-learn/PLIST
index 9c895b357fb..d0ffd4e1b0a 100644
--- a/math/py-scikit-learn/PLIST
+++ b/math/py-scikit-learn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/11/21 18:45:28 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/10/02 16:53:46 minskim 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/_config.py
+${PYSITELIB}/sklearn/_config.pyc
+${PYSITELIB}/sklearn/_config.pyo
 ${PYSITELIB}/sklearn/_isotonic.so
 ${PYSITELIB}/sklearn/base.py
 ${PYSITELIB}/sklearn/base.pyc
@@ -33,8 +36,8 @@ ${PYSITELIB}/sklearn/cluster/_feature_agglomeration.py
 ${PYSITELIB}/sklearn/cluster/_feature_agglomeration.pyc
 ${PYSITELIB}/sklearn/cluster/_feature_agglomeration.pyo
 ${PYSITELIB}/sklearn/cluster/_hierarchical.so
-${PYSITELIB}/sklearn/cluster/_k_means_elkan.so
 ${PYSITELIB}/sklearn/cluster/_k_means.so
+${PYSITELIB}/sklearn/cluster/_k_means_elkan.so
 ${PYSITELIB}/sklearn/cluster/affinity_propagation_.py
 ${PYSITELIB}/sklearn/cluster/affinity_propagation_.pyc
 ${PYSITELIB}/sklearn/cluster/affinity_propagation_.pyo
@@ -80,6 +83,9 @@ ${PYSITELIB}/sklearn/cluster/tests/test_birch.pyo
 ${PYSITELIB}/sklearn/cluster/tests/test_dbscan.py
 ${PYSITELIB}/sklearn/cluster/tests/test_dbscan.pyc
 ${PYSITELIB}/sklearn/cluster/tests/test_dbscan.pyo
+${PYSITELIB}/sklearn/cluster/tests/test_feature_agglomeration.py
+${PYSITELIB}/sklearn/cluster/tests/test_feature_agglomeration.pyc
+${PYSITELIB}/sklearn/cluster/tests/test_feature_agglomeration.pyo
 ${PYSITELIB}/sklearn/cluster/tests/test_hierarchical.py
 ${PYSITELIB}/sklearn/cluster/tests/test_hierarchical.pyc
 ${PYSITELIB}/sklearn/cluster/tests/test_hierarchical.pyo
@@ -92,18 +98,36 @@ ${PYSITELIB}/sklearn/cluster/tests/test_mean_shift.pyo
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.py
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.pyc
 ${PYSITELIB}/sklearn/cluster/tests/test_spectral.pyo
+${PYSITELIB}/sklearn/compose/__init__.py
+${PYSITELIB}/sklearn/compose/__init__.pyc
+${PYSITELIB}/sklearn/compose/__init__.pyo
+${PYSITELIB}/sklearn/compose/_column_transformer.py
+${PYSITELIB}/sklearn/compose/_column_transformer.pyc
+${PYSITELIB}/sklearn/compose/_column_transformer.pyo
+${PYSITELIB}/sklearn/compose/_target.py
+${PYSITELIB}/sklearn/compose/_target.pyc
+${PYSITELIB}/sklearn/compose/_target.pyo
+${PYSITELIB}/sklearn/compose/tests/__init__.py
+${PYSITELIB}/sklearn/compose/tests/__init__.pyc
+${PYSITELIB}/sklearn/compose/tests/__init__.pyo
+${PYSITELIB}/sklearn/compose/tests/test_column_transformer.py
+${PYSITELIB}/sklearn/compose/tests/test_column_transformer.pyc
+${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/covariance/__init__.py
 ${PYSITELIB}/sklearn/covariance/__init__.pyc
 ${PYSITELIB}/sklearn/covariance/__init__.pyo
+${PYSITELIB}/sklearn/covariance/elliptic_envelope.py
+${PYSITELIB}/sklearn/covariance/elliptic_envelope.pyc
+${PYSITELIB}/sklearn/covariance/elliptic_envelope.pyo
 ${PYSITELIB}/sklearn/covariance/empirical_covariance_.py
 ${PYSITELIB}/sklearn/covariance/empirical_covariance_.pyc
 ${PYSITELIB}/sklearn/covariance/empirical_covariance_.pyo
 ${PYSITELIB}/sklearn/covariance/graph_lasso_.py
 ${PYSITELIB}/sklearn/covariance/graph_lasso_.pyc
 ${PYSITELIB}/sklearn/covariance/graph_lasso_.pyo
-${PYSITELIB}/sklearn/covariance/outlier_detection.py
-${PYSITELIB}/sklearn/covariance/outlier_detection.pyc
-${PYSITELIB}/sklearn/covariance/outlier_detection.pyo
 ${PYSITELIB}/sklearn/covariance/robust_covariance.py
 ${PYSITELIB}/sklearn/covariance/robust_covariance.pyc
 ${PYSITELIB}/sklearn/covariance/robust_covariance.pyo
@@ -116,9 +140,15 @@ ${PYSITELIB}/sklearn/covariance/tests/__init__.pyo
 ${PYSITELIB}/sklearn/covariance/tests/test_covariance.py
 ${PYSITELIB}/sklearn/covariance/tests/test_covariance.pyc
 ${PYSITELIB}/sklearn/covariance/tests/test_covariance.pyo
+${PYSITELIB}/sklearn/covariance/tests/test_elliptic_envelope.py
+${PYSITELIB}/sklearn/covariance/tests/test_elliptic_envelope.pyc
+${PYSITELIB}/sklearn/covariance/tests/test_elliptic_envelope.pyo
 ${PYSITELIB}/sklearn/covariance/tests/test_graph_lasso.py
 ${PYSITELIB}/sklearn/covariance/tests/test_graph_lasso.pyc
 ${PYSITELIB}/sklearn/covariance/tests/test_graph_lasso.pyo
+${PYSITELIB}/sklearn/covariance/tests/test_graphical_lasso.py
+${PYSITELIB}/sklearn/covariance/tests/test_graphical_lasso.pyc
+${PYSITELIB}/sklearn/covariance/tests/test_graphical_lasso.pyo
 ${PYSITELIB}/sklearn/covariance/tests/test_robust_covariance.py
 ${PYSITELIB}/sklearn/covariance/tests/test_robust_covariance.pyc
 ${PYSITELIB}/sklearn/covariance/tests/test_robust_covariance.pyo
@@ -137,9 +167,6 @@ ${PYSITELIB}/sklearn/cross_decomposition/tests/__init__.pyo
 ${PYSITELIB}/sklearn/cross_decomposition/tests/test_pls.py
 ${PYSITELIB}/sklearn/cross_decomposition/tests/test_pls.pyc
 ${PYSITELIB}/sklearn/cross_decomposition/tests/test_pls.pyo
-${PYSITELIB}/sklearn/cross_validation.py
-${PYSITELIB}/sklearn/cross_validation.pyc
-${PYSITELIB}/sklearn/cross_validation.pyo
 ${PYSITELIB}/sklearn/datasets/__init__.py
 ${PYSITELIB}/sklearn/datasets/__init__.pyc
 ${PYSITELIB}/sklearn/datasets/__init__.pyo
@@ -164,14 +191,21 @@ ${PYSITELIB}/sklearn/datasets/data/linnerud_physiological.csv
 ${PYSITELIB}/sklearn/datasets/data/wine_data.csv
 ${PYSITELIB}/sklearn/datasets/descr/boston_house_prices.rst
 ${PYSITELIB}/sklearn/datasets/descr/breast_cancer.rst
+${PYSITELIB}/sklearn/datasets/descr/california_housing.rst
+${PYSITELIB}/sklearn/datasets/descr/covtype.rst
 ${PYSITELIB}/sklearn/datasets/descr/diabetes.rst
 ${PYSITELIB}/sklearn/datasets/descr/digits.rst
 ${PYSITELIB}/sklearn/datasets/descr/iris.rst
+${PYSITELIB}/sklearn/datasets/descr/kddcup99.rst
+${PYSITELIB}/sklearn/datasets/descr/lfw.rst
 ${PYSITELIB}/sklearn/datasets/descr/linnerud.rst
+${PYSITELIB}/sklearn/datasets/descr/olivetti_faces.rst
+${PYSITELIB}/sklearn/datasets/descr/rcv1.rst
+${PYSITELIB}/sklearn/datasets/descr/twenty_newsgroups.rst
 ${PYSITELIB}/sklearn/datasets/descr/wine_data.rst
+${PYSITELIB}/sklearn/datasets/images/README.txt
 ${PYSITELIB}/sklearn/datasets/images/china.jpg
 ${PYSITELIB}/sklearn/datasets/images/flower.jpg
-${PYSITELIB}/sklearn/datasets/images/README.txt
 ${PYSITELIB}/sklearn/datasets/kddcup99.py
 ${PYSITELIB}/sklearn/datasets/kddcup99.pyc
 ${PYSITELIB}/sklearn/datasets/kddcup99.pyo
@@ -187,6 +221,9 @@ ${PYSITELIB}/sklearn/datasets/mldata.pyo
 ${PYSITELIB}/sklearn/datasets/olivetti_faces.py
 ${PYSITELIB}/sklearn/datasets/olivetti_faces.pyc
 ${PYSITELIB}/sklearn/datasets/olivetti_faces.pyo
+${PYSITELIB}/sklearn/datasets/openml.py
+${PYSITELIB}/sklearn/datasets/openml.pyc
+${PYSITELIB}/sklearn/datasets/openml.pyo
 ${PYSITELIB}/sklearn/datasets/rcv1.py
 ${PYSITELIB}/sklearn/datasets/rcv1.pyc
 ${PYSITELIB}/sklearn/datasets/rcv1.pyo
@@ -205,9 +242,50 @@ ${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/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/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
+${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-features-292.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-features-40981.json.gz
+${PYSITELIB}/sklearn/datasets/tests/data/openml/292/api-v1-json-data-list-data_name-australian-limit-2-data_version-1-status-deactivated.json.gz
+${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/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/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/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
+${PYSITELIB}/sklearn/datasets/tests/data/openml/40966/api-v1-json-data-40966.json.gz
+${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/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/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/data-v1-download-61.arff.gz
 ${PYSITELIB}/sklearn/datasets/tests/data/svmlight_classification.txt
-${PYSITELIB}/sklearn/datasets/tests/data/svmlight_invalid_order.txt
 ${PYSITELIB}/sklearn/datasets/tests/data/svmlight_invalid.txt
+${PYSITELIB}/sklearn/datasets/tests/data/svmlight_invalid_order.txt
 ${PYSITELIB}/sklearn/datasets/tests/data/svmlight_multilabel.txt
 ${PYSITELIB}/sklearn/datasets/tests/test_20news.py
 ${PYSITELIB}/sklearn/datasets/tests/test_20news.pyc
@@ -215,6 +293,12 @@ ${PYSITELIB}/sklearn/datasets/tests/test_20news.pyo
 ${PYSITELIB}/sklearn/datasets/tests/test_base.py
 ${PYSITELIB}/sklearn/datasets/tests/test_base.pyc
 ${PYSITELIB}/sklearn/datasets/tests/test_base.pyo
+${PYSITELIB}/sklearn/datasets/tests/test_california_housing.py
+${PYSITELIB}/sklearn/datasets/tests/test_california_housing.pyc
+${PYSITELIB}/sklearn/datasets/tests/test_california_housing.pyo
+${PYSITELIB}/sklearn/datasets/tests/test_common.py
+${PYSITELIB}/sklearn/datasets/tests/test_common.pyc
+${PYSITELIB}/sklearn/datasets/tests/test_common.pyo
 ${PYSITELIB}/sklearn/datasets/tests/test_covtype.py
 ${PYSITELIB}/sklearn/datasets/tests/test_covtype.pyc
 ${PYSITELIB}/sklearn/datasets/tests/test_covtype.pyo
@@ -227,6 +311,9 @@ ${PYSITELIB}/sklearn/datasets/tests/test_lfw.pyo
 ${PYSITELIB}/sklearn/datasets/tests/test_mldata.py
 ${PYSITELIB}/sklearn/datasets/tests/test_mldata.pyc
 ${PYSITELIB}/sklearn/datasets/tests/test_mldata.pyo
+${PYSITELIB}/sklearn/datasets/tests/test_openml.py
+${PYSITELIB}/sklearn/datasets/tests/test_openml.pyc
+${PYSITELIB}/sklearn/datasets/tests/test_openml.pyo
 ${PYSITELIB}/sklearn/datasets/tests/test_rcv1.py
 ${PYSITELIB}/sklearn/datasets/tests/test_rcv1.pyc
 ${PYSITELIB}/sklearn/datasets/tests/test_rcv1.pyo
@@ -356,12 +443,12 @@ ${PYSITELIB}/sklearn/ensemble/tests/test_base.pyo
 ${PYSITELIB}/sklearn/ensemble/tests/test_forest.py
 ${PYSITELIB}/sklearn/ensemble/tests/test_forest.pyc
 ${PYSITELIB}/sklearn/ensemble/tests/test_forest.pyo
-${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.py
-${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.pyc
-${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.pyo
 ${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting.py
 ${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting.pyc
 ${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting.pyo
+${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.py
+${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.pyc
+${PYSITELIB}/sklearn/ensemble/tests/test_gradient_boosting_loss_functions.pyo
 ${PYSITELIB}/sklearn/ensemble/tests/test_iforest.py
 ${PYSITELIB}/sklearn/ensemble/tests/test_iforest.pyc
 ${PYSITELIB}/sklearn/ensemble/tests/test_iforest.pyo
@@ -386,6 +473,15 @@ ${PYSITELIB}/sklearn/exceptions.pyo
 ${PYSITELIB}/sklearn/externals/__init__.py
 ${PYSITELIB}/sklearn/externals/__init__.pyc
 ${PYSITELIB}/sklearn/externals/__init__.pyo
+${PYSITELIB}/sklearn/externals/_arff.py
+${PYSITELIB}/sklearn/externals/_arff.pyc
+${PYSITELIB}/sklearn/externals/_arff.pyo
+${PYSITELIB}/sklearn/externals/_pilutil.py
+${PYSITELIB}/sklearn/externals/_pilutil.pyc
+${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
@@ -395,6 +491,12 @@ ${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
@@ -404,12 +506,108 @@ ${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
@@ -428,30 +626,30 @@ ${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/numpy_pickle.py
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle.pyc
-${PYSITELIB}/sklearn/externals/joblib/numpy_pickle.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
 ${PYSITELIB}/sklearn/externals/six.py
 ${PYSITELIB}/sklearn/externals/six.pyc
 ${PYSITELIB}/sklearn/externals/six.pyo
-${PYSITELIB}/sklearn/externals/test_externals_setup.py
-${PYSITELIB}/sklearn/externals/test_externals_setup.pyc
-${PYSITELIB}/sklearn/externals/test_externals_setup.pyo
 ${PYSITELIB}/sklearn/feature_extraction/__init__.py
 ${PYSITELIB}/sklearn/feature_extraction/__init__.pyc
 ${PYSITELIB}/sklearn/feature_extraction/__init__.pyo
@@ -540,9 +738,6 @@ ${PYSITELIB}/sklearn/gaussian_process/__init__.pyo
 ${PYSITELIB}/sklearn/gaussian_process/correlation_models.py
 ${PYSITELIB}/sklearn/gaussian_process/correlation_models.pyc
 ${PYSITELIB}/sklearn/gaussian_process/correlation_models.pyo
-${PYSITELIB}/sklearn/gaussian_process/gaussian_process.py
-${PYSITELIB}/sklearn/gaussian_process/gaussian_process.pyc
-${PYSITELIB}/sklearn/gaussian_process/gaussian_process.pyo
 ${PYSITELIB}/sklearn/gaussian_process/gpc.py
 ${PYSITELIB}/sklearn/gaussian_process/gpc.pyc
 ${PYSITELIB}/sklearn/gaussian_process/gpc.pyo
@@ -558,9 +753,6 @@ ${PYSITELIB}/sklearn/gaussian_process/regression_models.pyo
 ${PYSITELIB}/sklearn/gaussian_process/tests/__init__.py
 ${PYSITELIB}/sklearn/gaussian_process/tests/__init__.pyc
 ${PYSITELIB}/sklearn/gaussian_process/tests/__init__.pyo
-${PYSITELIB}/sklearn/gaussian_process/tests/test_gaussian_process.py
-${PYSITELIB}/sklearn/gaussian_process/tests/test_gaussian_process.pyc
-${PYSITELIB}/sklearn/gaussian_process/tests/test_gaussian_process.pyo
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_gpc.py
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_gpc.pyc
 ${PYSITELIB}/sklearn/gaussian_process/tests/test_gpc.pyo
@@ -570,9 +762,9 @@ ${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/grid_search.py
-${PYSITELIB}/sklearn/grid_search.pyc
-${PYSITELIB}/sklearn/grid_search.pyo
+${PYSITELIB}/sklearn/impute.py
+${PYSITELIB}/sklearn/impute.pyc
+${PYSITELIB}/sklearn/impute.pyo
 ${PYSITELIB}/sklearn/isotonic.py
 ${PYSITELIB}/sklearn/isotonic.pyc
 ${PYSITELIB}/sklearn/isotonic.pyo
@@ -582,9 +774,6 @@ ${PYSITELIB}/sklearn/kernel_approximation.pyo
 ${PYSITELIB}/sklearn/kernel_ridge.py
 ${PYSITELIB}/sklearn/kernel_ridge.pyc
 ${PYSITELIB}/sklearn/kernel_ridge.pyo
-${PYSITELIB}/sklearn/learning_curve.py
-${PYSITELIB}/sklearn/learning_curve.pyc
-${PYSITELIB}/sklearn/learning_curve.pyo
 ${PYSITELIB}/sklearn/linear_model/__init__.py
 ${PYSITELIB}/sklearn/linear_model/__init__.pyc
 ${PYSITELIB}/sklearn/linear_model/__init__.pyo
@@ -625,10 +814,10 @@ ${PYSITELIB}/sklearn/linear_model/ransac.pyo
 ${PYSITELIB}/sklearn/linear_model/ridge.py
 ${PYSITELIB}/sklearn/linear_model/ridge.pyc
 ${PYSITELIB}/sklearn/linear_model/ridge.pyo
-${PYSITELIB}/sklearn/linear_model/sag_fast.so
 ${PYSITELIB}/sklearn/linear_model/sag.py
 ${PYSITELIB}/sklearn/linear_model/sag.pyc
 ${PYSITELIB}/sklearn/linear_model/sag.pyo
+${PYSITELIB}/sklearn/linear_model/sag_fast.so
 ${PYSITELIB}/sklearn/linear_model/setup.py
 ${PYSITELIB}/sklearn/linear_model/setup.pyc
 ${PYSITELIB}/sklearn/linear_model/setup.pyo
@@ -759,6 +948,9 @@ ${PYSITELIB}/sklearn/metrics/cluster/tests/__init__.pyo
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_bicluster.py
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_bicluster.pyc
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_bicluster.pyo
+${PYSITELIB}/sklearn/metrics/cluster/tests/test_common.py
+${PYSITELIB}/sklearn/metrics/cluster/tests/test_common.pyc
+${PYSITELIB}/sklearn/metrics/cluster/tests/test_common.pyo
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_supervised.py
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_supervised.pyc
 ${PYSITELIB}/sklearn/metrics/cluster/tests/test_supervised.pyo
@@ -768,10 +960,10 @@ ${PYSITELIB}/sklearn/metrics/cluster/tests/test_unsupervised.pyo
 ${PYSITELIB}/sklearn/metrics/cluster/unsupervised.py
 ${PYSITELIB}/sklearn/metrics/cluster/unsupervised.pyc
 ${PYSITELIB}/sklearn/metrics/cluster/unsupervised.pyo
-${PYSITELIB}/sklearn/metrics/pairwise_fast.so
 ${PYSITELIB}/sklearn/metrics/pairwise.py
 ${PYSITELIB}/sklearn/metrics/pairwise.pyc
 ${PYSITELIB}/sklearn/metrics/pairwise.pyo
+${PYSITELIB}/sklearn/metrics/pairwise_fast.so
 ${PYSITELIB}/sklearn/metrics/ranking.py
 ${PYSITELIB}/sklearn/metrics/ranking.pyc
 ${PYSITELIB}/sklearn/metrics/ranking.pyo
@@ -814,30 +1006,21 @@ ${PYSITELIB}/sklearn/mixture/base.pyo
 ${PYSITELIB}/sklearn/mixture/bayesian_mixture.py
 ${PYSITELIB}/sklearn/mixture/bayesian_mixture.pyc
 ${PYSITELIB}/sklearn/mixture/bayesian_mixture.pyo
-${PYSITELIB}/sklearn/mixture/dpgmm.py
-${PYSITELIB}/sklearn/mixture/dpgmm.pyc
-${PYSITELIB}/sklearn/mixture/dpgmm.pyo
 ${PYSITELIB}/sklearn/mixture/gaussian_mixture.py
 ${PYSITELIB}/sklearn/mixture/gaussian_mixture.pyc
 ${PYSITELIB}/sklearn/mixture/gaussian_mixture.pyo
-${PYSITELIB}/sklearn/mixture/gmm.py
-${PYSITELIB}/sklearn/mixture/gmm.pyc
-${PYSITELIB}/sklearn/mixture/gmm.pyo
 ${PYSITELIB}/sklearn/mixture/tests/__init__.py
 ${PYSITELIB}/sklearn/mixture/tests/__init__.pyc
 ${PYSITELIB}/sklearn/mixture/tests/__init__.pyo
 ${PYSITELIB}/sklearn/mixture/tests/test_bayesian_mixture.py
 ${PYSITELIB}/sklearn/mixture/tests/test_bayesian_mixture.pyc
 ${PYSITELIB}/sklearn/mixture/tests/test_bayesian_mixture.pyo
-${PYSITELIB}/sklearn/mixture/tests/test_dpgmm.py
-${PYSITELIB}/sklearn/mixture/tests/test_dpgmm.pyc
-${PYSITELIB}/sklearn/mixture/tests/test_dpgmm.pyo
 ${PYSITELIB}/sklearn/mixture/tests/test_gaussian_mixture.py
 ${PYSITELIB}/sklearn/mixture/tests/test_gaussian_mixture.pyc
 ${PYSITELIB}/sklearn/mixture/tests/test_gaussian_mixture.pyo
-${PYSITELIB}/sklearn/mixture/tests/test_gmm.py
-${PYSITELIB}/sklearn/mixture/tests/test_gmm.pyc
-${PYSITELIB}/sklearn/mixture/tests/test_gmm.pyo
+${PYSITELIB}/sklearn/mixture/tests/test_mixture.py
+${PYSITELIB}/sklearn/mixture/tests/test_mixture.pyc
+${PYSITELIB}/sklearn/mixture/tests/test_mixture.pyo
 ${PYSITELIB}/sklearn/model_selection/__init__.py
 ${PYSITELIB}/sklearn/model_selection/__init__.pyc
 ${PYSITELIB}/sklearn/model_selection/__init__.pyo
@@ -975,9 +1158,18 @@ ${PYSITELIB}/sklearn/pipeline.pyo
 ${PYSITELIB}/sklearn/preprocessing/__init__.py
 ${PYSITELIB}/sklearn/preprocessing/__init__.pyc
 ${PYSITELIB}/sklearn/preprocessing/__init__.pyo
+${PYSITELIB}/sklearn/preprocessing/_discretization.py
+${PYSITELIB}/sklearn/preprocessing/_discretization.pyc
+${PYSITELIB}/sklearn/preprocessing/_discretization.pyo
+${PYSITELIB}/sklearn/preprocessing/_encoders.py
+${PYSITELIB}/sklearn/preprocessing/_encoders.pyc
+${PYSITELIB}/sklearn/preprocessing/_encoders.pyo
 ${PYSITELIB}/sklearn/preprocessing/_function_transformer.py
 ${PYSITELIB}/sklearn/preprocessing/_function_transformer.pyc
 ${PYSITELIB}/sklearn/preprocessing/_function_transformer.pyo
+${PYSITELIB}/sklearn/preprocessing/base.py
+${PYSITELIB}/sklearn/preprocessing/base.pyc
+${PYSITELIB}/sklearn/preprocessing/base.pyo
 ${PYSITELIB}/sklearn/preprocessing/data.py
 ${PYSITELIB}/sklearn/preprocessing/data.pyc
 ${PYSITELIB}/sklearn/preprocessing/data.pyo
@@ -990,9 +1182,21 @@ ${PYSITELIB}/sklearn/preprocessing/label.pyo
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.py
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.pyc
 ${PYSITELIB}/sklearn/preprocessing/tests/__init__.pyo
+${PYSITELIB}/sklearn/preprocessing/tests/test_base.py
+${PYSITELIB}/sklearn/preprocessing/tests/test_base.pyc
+${PYSITELIB}/sklearn/preprocessing/tests/test_base.pyo
+${PYSITELIB}/sklearn/preprocessing/tests/test_common.py
+${PYSITELIB}/sklearn/preprocessing/tests/test_common.pyc
+${PYSITELIB}/sklearn/preprocessing/tests/test_common.pyo
 ${PYSITELIB}/sklearn/preprocessing/tests/test_data.py
 ${PYSITELIB}/sklearn/preprocessing/tests/test_data.pyc
 ${PYSITELIB}/sklearn/preprocessing/tests/test_data.pyo
+${PYSITELIB}/sklearn/preprocessing/tests/test_discretization.py
+${PYSITELIB}/sklearn/preprocessing/tests/test_discretization.pyc
+${PYSITELIB}/sklearn/preprocessing/tests/test_discretization.pyo
+${PYSITELIB}/sklearn/preprocessing/tests/test_encoders.py
+${PYSITELIB}/sklearn/preprocessing/tests/test_encoders.pyc
+${PYSITELIB}/sklearn/preprocessing/tests/test_encoders.pyo
 ${PYSITELIB}/sklearn/preprocessing/tests/test_function_transformer.py
 ${PYSITELIB}/sklearn/preprocessing/tests/test_function_transformer.pyc
 ${PYSITELIB}/sklearn/preprocessing/tests/test_function_transformer.pyo
@@ -1033,8 +1237,8 @@ ${PYSITELIB}/sklearn/svm/classes.py
 ${PYSITELIB}/sklearn/svm/classes.pyc
 ${PYSITELIB}/sklearn/svm/classes.pyo
 ${PYSITELIB}/sklearn/svm/liblinear.so
-${PYSITELIB}/sklearn/svm/libsvm_sparse.so
 ${PYSITELIB}/sklearn/svm/libsvm.so
+${PYSITELIB}/sklearn/svm/libsvm_sparse.so
 ${PYSITELIB}/sklearn/svm/setup.py
 ${PYSITELIB}/sklearn/svm/setup.pyc
 ${PYSITELIB}/sklearn/svm/setup.pyo
@@ -1068,9 +1272,6 @@ ${PYSITELIB}/sklearn/tests/test_common.pyo
 ${PYSITELIB}/sklearn/tests/test_config.py
 ${PYSITELIB}/sklearn/tests/test_config.pyc
 ${PYSITELIB}/sklearn/tests/test_config.pyo
-${PYSITELIB}/sklearn/tests/test_cross_validation.py
-${PYSITELIB}/sklearn/tests/test_cross_validation.pyc
-${PYSITELIB}/sklearn/tests/test_cross_validation.pyo
 ${PYSITELIB}/sklearn/tests/test_discriminant_analysis.py
 ${PYSITELIB}/sklearn/tests/test_discriminant_analysis.pyc
 ${PYSITELIB}/sklearn/tests/test_discriminant_analysis.pyo
@@ -1080,9 +1281,9 @@ ${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_grid_search.py
-${PYSITELIB}/sklearn/tests/test_grid_search.pyc
-${PYSITELIB}/sklearn/tests/test_grid_search.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
@@ -1095,9 +1296,6 @@ ${PYSITELIB}/sklearn/tests/test_kernel_approximation.pyo
 ${PYSITELIB}/sklearn/tests/test_kernel_ridge.py
 ${PYSITELIB}/sklearn/tests/test_kernel_ridge.pyc
 ${PYSITELIB}/sklearn/tests/test_kernel_ridge.pyo
-${PYSITELIB}/sklearn/tests/test_learning_curve.py
-${PYSITELIB}/sklearn/tests/test_learning_curve.pyc
-${PYSITELIB}/sklearn/tests/test_learning_curve.pyo
 ${PYSITELIB}/sklearn/tests/test_metaestimators.py
 ${PYSITELIB}/sklearn/tests/test_metaestimators.pyc
 ${PYSITELIB}/sklearn/tests/test_metaestimators.pyo
@@ -1116,6 +1314,9 @@ ${PYSITELIB}/sklearn/tests/test_pipeline.pyo
 ${PYSITELIB}/sklearn/tests/test_random_projection.py
 ${PYSITELIB}/sklearn/tests/test_random_projection.pyc
 ${PYSITELIB}/sklearn/tests/test_random_projection.pyo
+${PYSITELIB}/sklearn/tests/test_site_joblib.py
+${PYSITELIB}/sklearn/tests/test_site_joblib.pyc
+${PYSITELIB}/sklearn/tests/test_site_joblib.pyo
 ${PYSITELIB}/sklearn/tree/__init__.py
 ${PYSITELIB}/sklearn/tree/__init__.pyc
 ${PYSITELIB}/sklearn/tree/__init__.pyo
@@ -1144,11 +1345,20 @@ ${PYSITELIB}/sklearn/tree/tree.pyo
 ${PYSITELIB}/sklearn/utils/__init__.py
 ${PYSITELIB}/sklearn/utils/__init__.pyc
 ${PYSITELIB}/sklearn/utils/__init__.pyo
+${PYSITELIB}/sklearn/utils/_joblib.py
+${PYSITELIB}/sklearn/utils/_joblib.pyc
+${PYSITELIB}/sklearn/utils/_joblib.pyo
 ${PYSITELIB}/sklearn/utils/_logistic_sigmoid.so
 ${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
@@ -1172,10 +1382,10 @@ ${PYSITELIB}/sklearn/utils/fast_dict.so
 ${PYSITELIB}/sklearn/utils/fixes.py
 ${PYSITELIB}/sklearn/utils/fixes.pyc
 ${PYSITELIB}/sklearn/utils/fixes.pyo
-${PYSITELIB}/sklearn/utils/graph_shortest_path.so
 ${PYSITELIB}/sklearn/utils/graph.py
 ${PYSITELIB}/sklearn/utils/graph.pyc
 ${PYSITELIB}/sklearn/utils/graph.pyo
+${PYSITELIB}/sklearn/utils/graph_shortest_path.so
 ${PYSITELIB}/sklearn/utils/lgamma.so
 ${PYSITELIB}/sklearn/utils/linear_assignment_.py
 ${PYSITELIB}/sklearn/utils/linear_assignment_.pyc
@@ -1200,10 +1410,10 @@ ${PYSITELIB}/sklearn/utils/seq_dataset.so
 ${PYSITELIB}/sklearn/utils/setup.py
 ${PYSITELIB}/sklearn/utils/setup.pyc
 ${PYSITELIB}/sklearn/utils/setup.pyo
-${PYSITELIB}/sklearn/utils/sparsefuncs_fast.so
 ${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
@@ -1270,6 +1480,9 @@ ${PYSITELIB}/sklearn/utils/tests/test_seq_dataset.pyo
 ${PYSITELIB}/sklearn/utils/tests/test_shortest_path.py
 ${PYSITELIB}/sklearn/utils/tests/test_shortest_path.pyc
 ${PYSITELIB}/sklearn/utils/tests/test_shortest_path.pyo
+${PYSITELIB}/sklearn/utils/tests/test_show_versions.py
+${PYSITELIB}/sklearn/utils/tests/test_show_versions.pyc
+${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
diff --git a/math/py-scikit-learn/distinfo b/math/py-scikit-learn/distinfo
index df9788d4062..d4d35311abd 100644
--- a/math/py-scikit-learn/distinfo
+++ b/math/py-scikit-learn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/08/06 16:18:12 minskim Exp $
+$NetBSD: distinfo,v 1.5 2018/10/02 16:53:46 minskim Exp $
 
-SHA1 (scikit-learn-0.19.2.tar.gz) = 9c08594d6a0acedc7b2101c5b114ab31c57fcd86
-RMD160 (scikit-learn-0.19.2.tar.gz) = c6ded64cadf7ba3d3a40abc28835d5d1b852e5cf
-SHA512 (scikit-learn-0.19.2.tar.gz) = 80c818923d5cc439b0878de56a11ca2f84c586adb40d51c70b77402dc72853a9e96fdfd1af39a547f871a41d7d04f8caa3861ca81a25b64d1dd1e7f176f232f7
-Size (scikit-learn-0.19.2.tar.gz) = 9680746 bytes
+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