Skip to content

Commit 2db2a8e

Browse files
committed
COMPAT: Avoid td.skip decorator
It wasn't backported, so we use pytest directly.
1 parent 13bf01a commit 2db2a8e

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

pandas/tests/test_nanops.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import division, print_function
33

4+
from distutils.version import LooseVersion
45
from functools import partial
56

67
import pytest
@@ -468,8 +469,10 @@ def test_nankurt(self):
468469
allow_str=False, allow_date=False,
469470
allow_tdelta=False)
470471

471-
@td.skip_if_no("numpy", min_version="1.10.0")
472472
def test_nanprod(self):
473+
if LooseVersion(np.__version__) < LooseVersion("1.10.0"):
474+
raise pytest.skip("np.nanprod added in 1.10.0")
475+
473476
self.check_funs(nanops.nanprod, np.prod, allow_str=False,
474477
allow_date=False, allow_tdelta=False,
475478
empty_targfunc=np.nanprod)

pandas/tests/test_panel.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from warnings import catch_warnings
55
from datetime import datetime
6+
from distutils.version import LooseVersion
67
import operator
78
import pytest
89

@@ -87,8 +88,10 @@ def test_sum(self):
8788
def test_mean(self):
8889
self._check_stat_op('mean', np.mean)
8990

90-
@td.skip_if_no("numpy", min_version="1.10.0")
9191
def test_prod(self):
92+
if LooseVersion(np.__version__) < LooseVersion("1.10.0"):
93+
raise pytest.skip("np.nanprod added in 1.10.0")
94+
9295
self._check_stat_op('prod', np.prod, skipna_alternative=np.nanprod)
9396

9497
def test_median(self):

pandas/tests/test_panel4d.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import operator
55
import pytest
66
from warnings import catch_warnings
7+
from distutils.version import LooseVersion
78
import numpy as np
89

910
from pandas import Series, Index, isna, notna
@@ -41,8 +42,10 @@ def test_sum(self):
4142
def test_mean(self):
4243
self._check_stat_op('mean', np.mean)
4344

44-
@td.skip_if_no("numpy", min_version="1.10.0")
4545
def test_prod(self):
46+
if LooseVersion(np.__version__) < LooseVersion("1.10.0"):
47+
raise pytest.skip("np.nanprod added in 1.10.0")
48+
4649
self._check_stat_op('prod', np.prod, skipna_alternative=np.nanprod)
4750

4851
def test_median(self):

0 commit comments

Comments
 (0)