diff --git a/pandas/conftest.py b/pandas/conftest.py index 9d806a91f37f7..d6b18db4e71f2 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -137,6 +137,14 @@ def nselect_method(request): return request.param +@pytest.fixture(params=['left', 'right', 'both', 'neither']) +def closed(request): + """ + Fixture for trying all interval closed parameters + """ + return request.param + + @pytest.fixture(params=[None, np.nan, pd.NaT, float('nan'), np.float('NaN')]) def nulls_fixture(request): """ diff --git a/pandas/tests/indexes/interval/test_construction.py b/pandas/tests/indexes/interval/test_construction.py index b1711c3444586..ac946a3421e53 100644 --- a/pandas/tests/indexes/interval/test_construction.py +++ b/pandas/tests/indexes/interval/test_construction.py @@ -14,11 +14,6 @@ import pandas.util.testing as tm -@pytest.fixture(params=['left', 'right', 'both', 'neither']) -def closed(request): - return request.param - - @pytest.fixture(params=[None, 'foo']) def name(request): return request.param diff --git a/pandas/tests/indexes/interval/test_interval.py b/pandas/tests/indexes/interval/test_interval.py index 9920809a18a24..6a7330f8cfb68 100644 --- a/pandas/tests/indexes/interval/test_interval.py +++ b/pandas/tests/indexes/interval/test_interval.py @@ -12,11 +12,6 @@ import pandas as pd -@pytest.fixture(scope='class', params=['left', 'right', 'both', 'neither']) -def closed(request): - return request.param - - @pytest.fixture(scope='class', params=[None, 'foo']) def name(request): return request.param diff --git a/pandas/tests/indexes/interval/test_interval_range.py b/pandas/tests/indexes/interval/test_interval_range.py index 29fe2b0185662..447856e7e9d51 100644 --- a/pandas/tests/indexes/interval/test_interval_range.py +++ b/pandas/tests/indexes/interval/test_interval_range.py @@ -11,11 +11,6 @@ import pandas.util.testing as tm -@pytest.fixture(scope='class', params=['left', 'right', 'both', 'neither']) -def closed(request): - return request.param - - @pytest.fixture(scope='class', params=[None, 'foo']) def name(request): return request.param diff --git a/pandas/tests/indexes/interval/test_interval_tree.py b/pandas/tests/indexes/interval/test_interval_tree.py index 056d3e1087a2e..5f248bf7725e5 100644 --- a/pandas/tests/indexes/interval/test_interval_tree.py +++ b/pandas/tests/indexes/interval/test_interval_tree.py @@ -7,11 +7,6 @@ import pandas.util.testing as tm -@pytest.fixture(scope='class', params=['left', 'right', 'both', 'neither']) -def closed(request): - return request.param - - @pytest.fixture( scope='class', params=['int32', 'int64', 'float32', 'float64', 'uint64']) def dtype(request): diff --git a/pandas/tests/indexing/interval/test_interval.py b/pandas/tests/indexing/interval/test_interval.py index 233fbd2c8d7be..f2f59159032a2 100644 --- a/pandas/tests/indexing/interval/test_interval.py +++ b/pandas/tests/indexing/interval/test_interval.py @@ -3,7 +3,6 @@ import pandas as pd from pandas import Series, DataFrame, IntervalIndex, Interval -from pandas.compat import product import pandas.util.testing as tm @@ -51,9 +50,7 @@ def test_getitem_with_scalar(self): tm.assert_series_equal(expected, s[s >= 2]) # TODO: check this behavior is consistent with test_interval_new.py - @pytest.mark.parametrize('direction, closed', - product(('increasing', 'decreasing'), - ('left', 'right', 'neither', 'both'))) + @pytest.mark.parametrize('direction', ['increasing', 'decreasing']) def test_nonoverlapping_monotonic(self, direction, closed): tpls = [(0, 1), (2, 3), (4, 5)] if direction == 'decreasing':