BUG: skip scipy-depending test if not installed

Author: wesm

pandas/tests/test_panel4d.py

@@ -29,6 +29,13 @@ def add_nans(panel4d):
         panel = panel4d[label]
         tm.add_nans(panel)
 
+def _skip_if_no_scipy():
+    try:
+        import scipy.stats
+    except ImportError:
+        raise nose.SkipTest
+
+
 class SafeForLongAndSparse(object):
 
     _multiprocess_can_split_ = True
@@ -67,6 +74,7 @@ def test_max(self):
         self._check_stat_op('max', np.max)
 
     def test_skew(self):
+        _skip_if_no_scipy()
         from scipy.stats import skew
         def this_skew(x):
             if len(x) < 3:

vb_suite/join_merge.py

@@ -107,7 +107,7 @@
 merge_2intkey_nosort = Benchmark('merge(left, right, sort=False)', setup,
                                  start_date=datetime(2011, 10, 20))
 
-merge_2intkey_sort = Benchmark('merge(left, right)', setup,
+merge_2intkey_sort = Benchmark('merge(left, right, sort=True)', setup,
                                start_date=datetime(2011, 10, 20))
 
 #----------------------------------------------------------------------