From af7039a98e7636216a8cca16c60f127736063883 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 6 Feb 2016 11:28:34 -0600 Subject: [PATCH] TST: Skip scipy NaN test on 0.17 for now --- pandas/tests/test_nanops.py | 3 +++ pandas/util/testing.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/pandas/tests/test_nanops.py b/pandas/tests/test_nanops.py index ca5246ba98f89..79e200225d26a 100644 --- a/pandas/tests/test_nanops.py +++ b/pandas/tests/test_nanops.py @@ -380,6 +380,7 @@ def test_nanstd(self): def test_nansem(self): tm.skip_if_no_package('scipy.stats') + tm._skip_if_scipy_0_17() from scipy.stats import sem self.check_funs_ddof(nanops.nansem, sem, allow_complex=False, allow_str=False, allow_date=False, @@ -439,6 +440,7 @@ def _skew_kurt_wrap(self, values, axis=None, func=None): def test_nanskew(self): tm.skip_if_no_package('scipy.stats') + tm._skip_if_scipy_0_17() from scipy.stats import skew func = partial(self._skew_kurt_wrap, func=skew) self.check_funs(nanops.nanskew, func, allow_complex=False, @@ -446,6 +448,7 @@ def test_nanskew(self): def test_nankurt(self): tm.skip_if_no_package('scipy.stats') + tm._skip_if_scipy_0_17() from scipy.stats import kurtosis func1 = partial(kurtosis, fisher=True) func = partial(self._skew_kurt_wrap, func=func1) diff --git a/pandas/util/testing.py b/pandas/util/testing.py index aa5d698301da7..06262edfe0f19 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -217,6 +217,12 @@ def _skip_if_no_scipy(): import nose raise nose.SkipTest('scipy.interpolate missing') +def _skip_if_scipy_0_17(): + import scipy + v = scipy.__version__ + if v >= LooseVersion("0.17.0"): + import nose + raise nose.SkipTest("scipy 0.17") def _skip_if_no_pytz(): try: