API Deprecate externals.six (#12916)

scikit-learn · Jan 27, 2019 · 60be46cd33a28d7ce1fe5f0bff70f540687e1200 · 60be46c
1 parent 3207278
commit 60be46cd33a28d7ce1fe5f0bff70f540687e1200
Unified Split

Showing with 12 additions and 6 deletions.

+0 −2 benchmarks/bench_plot_fastkmeans.py

+0 −2 benchmarks/bench_plot_omp_lars.py

+0 −2 benchmarks/bench_plot_svd.py

+6 −0 doc/whats_new/v0.21.rst

+6 −0 sklearn/externals/six.py
diff --git a/benchmarks/bench_plot_fastkmeans.py b/benchmarks/bench_plot_fastkmeans.py
@@ -3,8 +3,6 @@
 from collections import defaultdict
 from time import time
 
-import six
-
 import numpy as np
 from numpy import random as nr
 

diff --git a/benchmarks/bench_plot_omp_lars.py b/benchmarks/bench_plot_omp_lars.py
@@ -9,8 +9,6 @@
 import sys
 from time import time
 
-import six
-
 import numpy as np
 
 from sklearn.linear_model import lars_path, orthogonal_mp

diff --git a/benchmarks/bench_plot_svd.py b/benchmarks/bench_plot_svd.py
@@ -7,8 +7,6 @@
 import numpy as np
 from collections import defaultdict
 
-import six
-
 from scipy.linalg import svd
 from sklearn.utils.extmath import randomized_svd
 from sklearn.datasets.samples_generator import make_low_rank_matrix

diff --git a/doc/whats_new/v0.21.rst b/doc/whats_new/v0.21.rst
@@ -91,6 +91,12 @@ Support for Python 3.4 and below has been officially dropped.
   with the document and the caller functions.
   :issue:`6463` by :user:`movelikeriver <movelikeriver>`.
 
+:mod:`sklearn.externals`
+........................
+
+- |API| Deprecated :mod:`externals.six` since we have dropped support for
+  Python 2.7. :issue:`12916` by :user:`Hanmin Qin <qinhanmin2014>`.
+
 :mod:`sklearn.linear_model`
 ...........................
 

diff --git a/sklearn/externals/six.py b/sklearn/externals/six.py
@@ -24,6 +24,12 @@
 import sys
 import types
 
+import warnings
+warnings.warn("The module is deprecated in version 0.21 and will be removed "
+              "in version 0.23 since we've dropped support for Python 2.7. "
+              "Please rely on the official version of six "
+              "(https://pypi.org/project/six/).", DeprecationWarning)
+
 __author__ = "Benjamin Peterson <benjamin@python.org>"
 __version__ = "1.4.1"