Skip to content

Commit 428b300

Browse files
committed
Removed imperative scipy skipif from fixture
1 parent a9bff28 commit 428b300

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

pandas/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from distutils.version import LooseVersion
44
import numpy
55
import pandas
6-
import pandas.util.testing as tm
76
import dateutil
87

98

@@ -51,7 +50,6 @@ def add_imports(doctest_namespace):
5150

5251
@pytest.fixture(params=['bsr', 'coo', 'csc', 'csr', 'dia', 'dok', 'lil'])
5352
def spmatrix(request):
54-
tm._skip_if_no_scipy()
5553
from scipy import sparse
5654
return getattr(sparse, request.param + '_matrix')
5755

pandas/tests/sparse/test_frame.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,6 +1226,7 @@ def test_from_to_scipy(spmatrix, index, columns, fill_value, dtype):
12261226
assert sdf.to_coo().dtype == np.object_
12271227

12281228

1229+
@td.skip_if_no_scipy
12291230
@pytest.mark.parametrize('fill_value', [None, 0, np.nan]) # noqa: F811
12301231
def test_from_to_scipy_object(spmatrix, fill_value):
12311232
# GH 4343

0 commit comments

Comments
 (0)