[MRG] MAINT Removing more deprecated stuff for v0.18 (scikit-learn#5528)

* MNT Removing more deprecated stuff for v0.18 * MNT+TST Remove support for loss='l2' * MNT Remove support for precompute='auto' for ElasticNet * FIX/TST precompute=auto should raise a generic message

Author: raghavrv

sklearn/feature_extraction/text.py

@@ -280,12 +280,6 @@ def _check_vocabulary(self):
  if len(self.vocabulary_) == 0:
  raise ValueError("Vocabulary is empty")
 
- @property
- @deprecated("The `fixed_vocabulary` attribute is deprecated and will be "
- "removed in 0.18. Please use `fixed_vocabulary_` instead.")
- def fixed_vocabulary(self):
- return self.fixed_vocabulary_
-
 
 class HashingVectorizer(BaseEstimator, VectorizerMixin):
  """Convert a collection of text documents to a matrix of token occurrences

sklearn/linear_model/coordinate_descent.py

@@ -462,7 +462,7 @@ def enet_path(X, y, l1_ratio=0.5, eps=1e-3, n_alphas=100, alphas=None,
  positive)
  else:
  raise ValueError("Precompute should be one of True, False, "
- "'auto' or array-like")
+ "'auto' or array-like. Got %r" % precompute)
  coef_, dual_gap_, eps_, n_iter_ = model
  coefs[..., i] = coef_
  dual_gaps[i] = dual_gap_
@@ -548,9 +548,8 @@ class ElasticNet(LinearModel, RegressorMixin):
 
  precompute : True | False | array-like
  Whether to use a precomputed Gram matrix to speed up
- calculations. If set to ``'auto'`` let us decide. The Gram
- matrix can also be passed as argument. For sparse input
- this option is always ``True`` to preserve sparsity.
+ calculations. The Gram matrix can also be passed as argument.
+ For sparse input this option is always ``True`` to preserve sparsity.
 
  max_iter : int, optional
  The maximum number of iterations
@@ -661,12 +660,10 @@ def fit(self, X, y, check_input=True):
  "well. You are advised to use the LinearRegression "
  "estimator", stacklevel=2)
 
- if (isinstance(self.precompute, six.string_types) and
- self.precompute == 'auto'):
- warnings.warn("Setting precompute to 'auto', was found to be "
- "slower even when n_samples > n_features. Hence "
- "it will be removed in 0.18.",
- DeprecationWarning, stacklevel=2)
+ if isinstance(self.precompute, six.string_types):
+ raise ValueError('precompute should be one of True, False or'
+ ' array-like. Got %r' % self.precompute)
+
  # We expect X and y to be already float64 Fortran ordered arrays
  # when bypassing checks
  if check_input:

sklearn/linear_model/tests/test_coordinate_descent.py

@@ -16,6 +16,7 @@
 from sklearn.utils.testing import assert_true
 from sklearn.utils.testing import assert_greater
 from sklearn.utils.testing import assert_raises
+from sklearn.utils.testing import assert_raises_regex
 from sklearn.utils.testing import assert_warns
 from sklearn.utils.testing import assert_warns_message
 from sklearn.utils.testing import ignore_warnings
@@ -509,7 +510,12 @@ def test_precompute_invalid_argument():
  X, y, _, _ = build_dataset()
  for clf in [ElasticNetCV(precompute="invalid"),
  LassoCV(precompute="invalid")]:
- assert_raises(ValueError, clf.fit, X, y)
+ assert_raises_regex(ValueError, ".*should be.*True.*False.*auto.*"
+ "array-like.*Got 'invalid'", clf.fit, X, y)
+
+ # Precompute = 'auto' is not supported for ElasticNet
+ assert_raises_regex(ValueError, ".*should be.*True.*False.*array-like.*"
+ "Got 'auto'", ElasticNet(precompute='auto').fit, X, y)
 
 
 def test_warm_start_convergence():

sklearn/svm/base.py

@@ -547,7 +547,7 @@ def decision_function(self, X):
  dec = self._decision_function(X)
  if self.decision_function_shape is None and len(self.classes_) > 2:
  warnings.warn("The decision_function_shape default value will "
- "change from 'ovo' to 'ovr' in 0.18. This will change "
+ "change from 'ovo' to 'ovr' in 0.19. This will change "
  "the shape of the decision function returned by "
  "SVC.", ChangedBehaviorWarning)
  if self.decision_function_shape == 'ovr' and len(self.classes_) > 2:

sklearn/svm/bounds.py

@@ -53,12 +53,6 @@ def l1_min_c(X, y, loss='squared_hinge', fit_intercept=True,
  l1_min_c: float
  minimum value for C
  """
-
- if loss == "l2":
- warn("loss='l2' will be impossible from 0.18 onwards."
- " Use loss='squared_hinge' instead.",
- DeprecationWarning)
- loss = "squared_hinge"
  if loss not in ('squared_hinge', 'log'):
  raise ValueError('loss type not in ("squared_hinge", "log", "l2")')
 

sklearn/svm/classes.py

@@ -188,16 +188,13 @@ def fit(self, X, y, sample_weight=None):
  Returns self.
  """
  # FIXME Remove l1/l2 support in 1.0 -----------------------------------
- loss_l = self.loss.lower()
-
  msg = ("loss='%s' has been deprecated in favor of "
  "loss='%s' as of 0.16. Backward compatibility"
  " for the loss='%s' will be removed in %s")
 
- # FIXME change loss_l --> self.loss after 0.18
- if loss_l in ('l1', 'l2'):
+ if self.loss in ('l1', 'l2'):
  old_loss = self.loss
- self.loss = {'l1': 'hinge', 'l2': 'squared_hinge'}.get(loss_l)
+ self.loss = {'l1': 'hinge', 'l2': 'squared_hinge'}.get(self.loss)
  warnings.warn(msg % (old_loss, self.loss, old_loss, '1.0'),
  DeprecationWarning)
  # ---------------------------------------------------------------------
@@ -357,18 +354,15 @@ def fit(self, X, y, sample_weight=None):
  Returns self.
  """
  # FIXME Remove l1/l2 support in 1.0 -----------------------------------
- loss_l = self.loss.lower()
-
  msg = ("loss='%s' has been deprecated in favor of "
  "loss='%s' as of 0.16. Backward compatibility"
  " for the loss='%s' will be removed in %s")
 
- # FIXME change loss_l --> self.loss after 0.18
- if loss_l in ('l1', 'l2'):
+ if self.loss in ('l1', 'l2'):
  old_loss = self.loss
  self.loss = {'l1': 'epsilon_insensitive',
  'l2': 'squared_epsilon_insensitive'
- }.get(loss_l)
+ }.get(self.loss)
  warnings.warn(msg % (old_loss, self.loss, old_loss, '1.0'),
  DeprecationWarning)
  # ---------------------------------------------------------------------
@@ -467,7 +461,7 @@ class SVC(BaseSVC):
  (n_samples, n_classes * (n_classes - 1) / 2).
  The default of None will currently behave as 'ovo' for backward
  compatibility and raise a deprecation warning, but will change 'ovr'
- in 0.18.
+ in 0.19.
 
  .. versionadded:: 0.17
  *decision_function_shape='ovr'* is recommended.
@@ -620,7 +614,7 @@ class NuSVC(BaseSVC):
  (n_samples, n_classes * (n_classes - 1) / 2).
  The default of None will currently behave as 'ovo' for backward
  compatibility and raise a deprecation warning, but will change 'ovr'
- in 0.18.
+ in 0.19.
 
  .. versionadded:: 0.17
  *decision_function_shape='ovr'* is recommended.
@@ -1038,8 +1032,8 @@ def fit(self, X, y=None, sample_weight=None, **params):
  If X is not a C-ordered contiguous array it is copied.
 
  """
- super(OneClassSVM, self).fit(X, np.ones(_num_samples(X)), sample_weight=sample_weight,
- **params)
+ super(OneClassSVM, self).fit(X, np.ones(_num_samples(X)),
+ sample_weight=sample_weight, **params)
  return self
 
  def decision_function(self, X):

sklearn/svm/tests/test_bounds.py

@@ -1,6 +1,7 @@
 import nose
 from nose.tools import assert_equal, assert_true
 from sklearn.utils.testing import clean_warning_registry
+from sklearn.utils.testing import assert_raise_message
 import warnings
 
 import numpy as np
@@ -37,13 +38,9 @@ def test_l1_min_c():
  intercept_label))
  yield check
 
-
-def test_l2_deprecation():
- clean_warning_registry()
- with warnings.catch_warnings(record=True) as w:
- assert_equal(l1_min_c(dense_X, Y1, "l2"),
- l1_min_c(dense_X, Y1, "squared_hinge"))
- assert_equal(w[0].category, DeprecationWarning)
+ # loss='l2' should raise ValueError
+ assert_raise_message(ValueError, "loss type not in",
+ l1_min_c, dense_X, Y1, "l2")
 
 
 def check_l1_min_c(X, y, loss, fit_intercept=True, intercept_scaling=None):