Skip to content

Commit 5fe80ae

Browse files
committed
move fixtures to top-level conftest
1 parent 9d36104 commit 5fe80ae

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

pandas/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import numpy
44
import pandas
5+
import pandas.util.testing as tm
56

67

78
def pytest_addoption(parser):
@@ -30,3 +31,10 @@ def pytest_runtest_setup(item):
3031
def add_imports(doctest_namespace):
3132
doctest_namespace['np'] = numpy
3233
doctest_namespace['pd'] = pandas
34+
35+
36+
@pytest.fixture(params=['bsr', 'coo', 'csc', 'csr', 'dia', 'dok', 'lil'])
37+
def spmatrix(request):
38+
tm._skip_if_no_scipy()
39+
from scipy import sparse
40+
return getattr(sparse, request.param + '_matrix')

pandas/tests/core/conftest.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)