From b06f9bfd156f5e89d91d5080f1b6b6303133d3dc Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 7 Jan 2020 11:31:28 -0500 Subject: [PATCH 1/5] TST Updates test for deprecation in pandas.SparseArray --- sklearn/utils/tests/test_multiclass.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/utils/tests/test_multiclass.py b/sklearn/utils/tests/test_multiclass.py index 022252d0c4836..79e55666b41a8 100644 --- a/sklearn/utils/tests/test_multiclass.py +++ b/sklearn/utils/tests/test_multiclass.py @@ -291,7 +291,7 @@ def test_type_of_target(): def test_type_of_target_pandas_sparse(): pd = pytest.importorskip("pandas") - y = pd.SparseArray([1, np.nan, np.nan, 1, np.nan]) + y = pd.arrays.SparseArray([1, np.nan, np.nan, 1, np.nan]) msg = "y cannot be class 'SparseSeries' or 'SparseArray'" with pytest.raises(ValueError, match=msg): type_of_target(y) From 2c373255b92ef2d40764178bf543a62544dd83f1 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 7 Jan 2020 11:31:57 -0500 Subject: [PATCH 2/5] BLD [scipy-dev] From d9b17a698ec4ca80a19e67cae45070eb06834f46 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Wed, 8 Jan 2020 16:36:52 -0500 Subject: [PATCH 3/5] TST Checks pandas version [scipy-dev] --- sklearn/utils/tests/test_multiclass.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sklearn/utils/tests/test_multiclass.py b/sklearn/utils/tests/test_multiclass.py index 79e55666b41a8..428c6afdd18f9 100644 --- a/sklearn/utils/tests/test_multiclass.py +++ b/sklearn/utils/tests/test_multiclass.py @@ -3,6 +3,7 @@ import scipy.sparse as sp from itertools import product import pytest +from distutils.version import LooseVersion from scipy.sparse import issparse from scipy.sparse import csc_matrix @@ -291,7 +292,12 @@ def test_type_of_target(): def test_type_of_target_pandas_sparse(): pd = pytest.importorskip("pandas") - y = pd.arrays.SparseArray([1, np.nan, np.nan, 1, np.nan]) + if LooseVersion(pd.__version__) >= '0.25': + pd_sparse_array = pd.arrays.SparseArray + else: + pd_sparse_array = pd.SparseArray + + y = pd_sparse_array([1, np.nan, np.nan, 1, np.nan]) msg = "y cannot be class 'SparseSeries' or 'SparseArray'" with pytest.raises(ValueError, match=msg): type_of_target(y) From 208ca9244e6fe790205fd49231dd6680dfaa2eff Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Wed, 8 Jan 2020 16:44:40 -0500 Subject: [PATCH 4/5] BUG Fix --- examples/linear_model/plot_sgd_iris.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/linear_model/plot_sgd_iris.py b/examples/linear_model/plot_sgd_iris.py index 0dddf7475728d..8b1ec7cc120e7 100644 --- a/examples/linear_model/plot_sgd_iris.py +++ b/examples/linear_model/plot_sgd_iris.py @@ -58,7 +58,8 @@ for i, color in zip(clf.classes_, colors): idx = np.where(y == i) plt.scatter(X[idx, 0], X[idx, 1], c=color, label=iris.target_names[i], - cmap=plt.cm.Paired, edgecolor='black', s=20) + cmap=plt.cm.Paired, edgecolor='black', s=20, + reponse_method='predict') plt.title("Decision surface of multi-class SGD") plt.axis('tight') From cd9439ee1ab1ea410ac0c0e70890d53b692d8182 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Wed, 8 Jan 2020 16:45:03 -0500 Subject: [PATCH 5/5] REV [scipy-dev] --- examples/linear_model/plot_sgd_iris.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/linear_model/plot_sgd_iris.py b/examples/linear_model/plot_sgd_iris.py index 8b1ec7cc120e7..0dddf7475728d 100644 --- a/examples/linear_model/plot_sgd_iris.py +++ b/examples/linear_model/plot_sgd_iris.py @@ -58,8 +58,7 @@ for i, color in zip(clf.classes_, colors): idx = np.where(y == i) plt.scatter(X[idx, 0], X[idx, 1], c=color, label=iris.target_names[i], - cmap=plt.cm.Paired, edgecolor='black', s=20, - reponse_method='predict') + cmap=plt.cm.Paired, edgecolor='black', s=20) plt.title("Decision surface of multi-class SGD") plt.axis('tight')