FIX Make tests work (fix deprecation messages and fix RCA example)

Author: William de Vazelhes

metric_learn/itml.py

@@ -287,11 +287,11 @@ def fit(self, X, y, random_state=np.random, bounds=None):
     if self.num_labeled != 'deprecated':
       warnings.warn('"num_labeled" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0', DeprecationWarning)
+                    ' removed in 0.6.0', DeprecationWarning)
     if self.bounds != 'deprecated':
       warnings.warn('"bounds" parameter from initialization is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0. Use the "bounds" parameter of this '
+                    ' removed in 0.6.0. Use the "bounds" parameter of this '
                     'fit method instead.', DeprecationWarning)
     X, y = self._prepare_inputs(X, y, ensure_min_samples=2)
     num_constraints = self.num_constraints

metric_learn/lfda.py

@@ -85,7 +85,7 @@ def fit(self, X, y):
     if self.num_dims != 'deprecated':
       warnings.warn('"num_dims" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0. Use "n_components" instead',
+                    ' removed in 0.6.0. Use "n_components" instead',
                     DeprecationWarning)
     X, y = self._prepare_inputs(X, y, ensure_min_samples=2)
     unique_classes, y = np.unique(y, return_inverse=True)

metric_learn/lmnn.py

@@ -70,7 +70,7 @@ def fit(self, X, y):
     if self.num_dims != 'deprecated':
       warnings.warn('"num_dims" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0. Use "n_components" instead',
+                    ' removed in 0.6.0. Use "n_components" instead',
                     DeprecationWarning)
     k = self.k
     reg = self.regularization

metric_learn/lsml.py

@@ -234,7 +234,7 @@ def fit(self, X, y, random_state=np.random):
     if self.num_labeled != 'deprecated':
       warnings.warn('"num_labeled" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0', DeprecationWarning)
+                    ' removed in 0.6.0', DeprecationWarning)
     X, y = self._prepare_inputs(X, y, ensure_min_samples=2)
     num_constraints = self.num_constraints
     if num_constraints is None:

metric_learn/mlkr.py

@@ -89,7 +89,7 @@ def fit(self, X, y):
       if self.num_dims != 'deprecated':
         warnings.warn('"num_dims" parameter is not used.'
                       ' It has been deprecated in version 0.5.0 and will be'
-                      'removed in 0.6.0. Use "n_components" instead',
+                      ' removed in 0.6.0. Use "n_components" instead',
                       DeprecationWarning)
       X, y = self._prepare_inputs(X, y, y_numeric=True,
                                   ensure_min_samples=2)

metric_learn/mmc.py

@@ -469,7 +469,7 @@ def fit(self, X, y, random_state=np.random):
     if self.num_labeled != 'deprecated':
       warnings.warn('"num_labeled" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0', DeprecationWarning)
+                    ' removed in 0.6.0', DeprecationWarning)
     X, y = self._prepare_inputs(X, y, ensure_min_samples=2)
     num_constraints = self.num_constraints
     if num_constraints is None:

metric_learn/nca.py

@@ -71,7 +71,7 @@ def fit(self, X, y):
     if self.num_dims != 'deprecated':
       warnings.warn('"num_dims" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0. Use "n_components" instead',
+                    ' removed in 0.6.0. Use "n_components" instead',
                     DeprecationWarning)
     X, labels = self._prepare_inputs(X, y, ensure_min_samples=2)
     n, d = X.shape

metric_learn/rca.py

@@ -101,7 +101,7 @@ def fit(self, X, chunks):
     if self.num_dims != 'deprecated':
       warnings.warn('"num_dims" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0. Use "n_components" instead',
+                    ' removed in 0.6.0. Use "n_components" instead',
                     DeprecationWarning)
     X = self._prepare_inputs(X, ensure_min_samples=2)
 

metric_learn/sdml.py

@@ -243,7 +243,7 @@ def fit(self, X, y, random_state=np.random):
     if self.num_labeled != 'deprecated':
       warnings.warn('"num_labeled" parameter is not used.'
                     ' It has been deprecated in version 0.5.0 and will be'
-                    'removed in 0.6.0', DeprecationWarning)
+                    ' removed in 0.6.0', DeprecationWarning)
     X, y = self._prepare_inputs(X, y, ensure_min_samples=2)
     num_constraints = self.num_constraints
     if num_constraints is None:

test/metric_learn_test.py

@@ -71,7 +71,7 @@ def test_deprecation_num_labeled(self):
     lsml_supervised = LSML_Supervised(num_labeled=np.inf)
     msg = ('"num_labeled" parameter is not used.'
            ' It has been deprecated in version 0.5.0 and will be'
-           'removed in 0.6.0')
+           ' removed in 0.6.0')
     assert_warns_message(DeprecationWarning, msg, lsml_supervised.fit, X, y)
 
 
@@ -92,7 +92,7 @@ def test_deprecation_num_labeled(self):
     itml_supervised = ITML_Supervised(num_labeled=np.inf)
     msg = ('"num_labeled" parameter is not used.'
            ' It has been deprecated in version 0.5.0 and will be'
-           'removed in 0.6.0')
+           ' removed in 0.6.0')
     assert_warns_message(DeprecationWarning, msg, itml_supervised.fit, X, y)
 
   def test_deprecation_bounds(self):
@@ -104,7 +104,7 @@ def test_deprecation_bounds(self):
     itml_supervised = ITML_Supervised(bounds=None)
     msg = ('"bounds" parameter from initialization is not used.'
            ' It has been deprecated in version 0.5.0 and will be'
-           'removed in 0.6.0. Use the "bounds" parameter of this '
+           ' removed in 0.6.0. Use the "bounds" parameter of this '
            'fit method instead.')
     assert_warns_message(DeprecationWarning, msg, itml_supervised.fit, X, y)
 
@@ -282,7 +282,7 @@ def test_deprecation_num_labeled(self):
                                       balance_param=5e-5)
     msg = ('"num_labeled" parameter is not used.'
            ' It has been deprecated in version 0.5.0 and will be'
-           'removed in 0.6.0')
+           ' removed in 0.6.0')
     assert_warns_message(DeprecationWarning, msg, sdml_supervised.fit, X, y)
 
   def test_sdml_raises_warning_non_psd(self):
@@ -505,8 +505,7 @@ def test_deprecation_num_dims_nca(num_dims):
   nca = NCA(num_dims=num_dims)
   msg = ('"num_dims" parameter is not used.'
          ' It has been deprecated in version 0.5.0 and will be'
-         'removed in 0.6.0. Use "n_components" instead',
-         DeprecationWarning)
+         ' removed in 0.6.0. Use "n_components" instead')
   with pytest.warns(DeprecationWarning) as raised_warning:
     nca.fit(X, y)
   assert (str(raised_warning[0].message) == msg)
@@ -534,8 +533,7 @@ def test_deprecation_num_dims_lfda(num_dims):
   lfda = LFDA(num_dims=num_dims)
   msg = ('"num_dims" parameter is not used.'
          ' It has been deprecated in version 0.5.0 and will be'
-         'removed in 0.6.0. Use "n_components" instead',
-         DeprecationWarning)
+         ' removed in 0.6.0. Use "n_components" instead')
   with pytest.warns(DeprecationWarning) as raised_warning:
     lfda.fit(X, y)
   assert (str(raised_warning[0].message) == msg)
@@ -571,22 +569,20 @@ def test_deprecation_num_dims_rca(num_dims):
   # test that a deprecation message is thrown if num_labeled is set at
   # initialization
   # TODO: remove in v.0.6
-  X = np.array([[0, 0], [0, 1], [2, 0], [2, 1]])
-  y = np.array([1, 0, 1, 0])
+  X, y = load_iris(return_X_y=True)
   rca = RCA(num_dims=num_dims)
   msg = ('"num_dims" parameter is not used.'
          ' It has been deprecated in version 0.5.0 and will be'
-         'removed in 0.6.0. Use "n_components" instead',
-         DeprecationWarning)
+         ' removed in 0.6.0. Use "n_components" instead')
   with pytest.warns(DeprecationWarning) as raised_warning:
     rca.fit(X, y)
   assert (str(raised_warning[0].message) == msg)
 
-  rca_supervised = RCA_Supervised(num_dims=num_dims)
+  # we take a small number of chunks so that RCA works on iris
+  rca_supervised = RCA_Supervised(num_dims=num_dims, num_chunks=10)
   msg = ('"num_dims" parameter is not used.'
          ' It has been deprecated in version 0.5.0 and will be'
-         'removed in 0.6.0. Use "n_components" instead',
-         DeprecationWarning)
+         ' removed in 0.6.0. Use "n_components" instead')
   with pytest.warns(DeprecationWarning) as raised_warning:
     rca_supervised.fit(X, y)
   assert (str(raised_warning[0].message) == msg)
@@ -633,8 +629,7 @@ def test_deprecation_num_dims_mlkr(num_dims):
   mlkr = MLKR(num_dims=num_dims)
   msg = ('"num_dims" parameter is not used.'
          ' It has been deprecated in version 0.5.0 and will be'
-         'removed in 0.6.0. Use "n_components" instead',
-         DeprecationWarning)
+         ' removed in 0.6.0. Use "n_components" instead')
   with pytest.warns(DeprecationWarning) as raised_warning:
     mlkr.fit(X, y)
   assert (str(raised_warning[0].message) == msg)
@@ -687,7 +682,7 @@ def test_deprecation_num_labeled(self):
     mmc_supervised = MMC_Supervised(num_labeled=np.inf)
     msg = ('"num_labeled" parameter is not used.'
            ' It has been deprecated in version 0.5.0 and will be'
-           'removed in 0.6.0')
+           ' removed in 0.6.0')
     assert_warns_message(DeprecationWarning, msg, mmc_supervised.fit, X, y)