FIX: solve travis errors

dalmia · dalmia · commit 69ced9426048 · 2017-02-20T16:52:53.000+05:30
diff --git a/doc/tutorial/statistical_inference/unsupervised_learning_fixture.py b/doc/tutorial/statistical_inference/unsupervised_learning_fixture.py
@@ -1,10 +1,11 @@
-"""Fixture module to skip the unsupervised_learning.rst doctest for 
-versions of SciPy earlier than 0.12.0. 
+"""Fixture module to skip the unsupervised_learning.rst doctest for
+versions of SciPy earlier than 0.12.0.
 """
 from sklearn.utils.testing import SkipTest
 from sklearn.utils.fixes import sp_version
+from sklearn.utils import parse_version
 
 def setup_module(module):
-    if sp_version < (0, 12):
+    if sp_version < parse_version('0.12'):
         raise SkipTest("Skipping because SciPy version earlier than 0.12.0 and "
                        "thus does not include the scipy.misc.face() image.")
diff --git a/sklearn/neighbors/tests/test_dist_metrics.py b/sklearn/neighbors/tests/test_dist_metrics.py
@@ -60,7 +60,7 @@ def test_cdist(self):
 
     def check_cdist(self, metric, kwargs, D_true):
         if metric == 'canberra' and \
-            parse_version(scipy.__version__) <= parse_version('0.9'):
+                parse_version(scipy.__version__) <= parse_version('0.9'):
             raise SkipTest("Canberra distance incorrect in scipy < 0.9")
         dm = DistanceMetric.get_metric(metric, **kwargs)
         D12 = dm.pairwise(self.X1, self.X2)
@@ -84,8 +84,8 @@ def test_pdist(self):
             yield self.check_pdist_bool, metric, D_true
 
     def check_pdist(self, metric, kwargs, D_true):
-        if metric == 'canberra' and \
-            parse_version(scipy.__version__) <= parse_version('0.9'):
+        if metric == 'canberra'  \
+                parse_version(scipy.__version__) <= parse_version('0.9'):
             raise SkipTest("Canberra distance incorrect in scipy < 0.9")
         dm = DistanceMetric.get_metric(metric, **kwargs)
         D12 = dm.pairwise(self.X1)
