Skip to content

Commit 2c25197

Browse files
simonjayhawkinsjreback
authored andcommitted
REF/TST: resample/test_base.py (#25262)
1 parent ca5b1df commit 2c25197

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

pandas/tests/resample/test_base.py

+18-16
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@
2828
period_range, 'pi', datetime(2005, 1, 1), datetime(2005, 1, 10))
2929
TIMEDELTA_RANGE = (timedelta_range, 'tdi', '1 day', '10 day')
3030

31-
ALL_TIMESERIES_INDEXES = [DATE_RANGE, PERIOD_RANGE, TIMEDELTA_RANGE]
32-
33-
34-
def pytest_generate_tests(metafunc):
35-
# called once per each test function
36-
if metafunc.function.__name__.endswith('_all_ts'):
37-
metafunc.parametrize(
38-
'_index_factory,_series_name,_index_start,_index_end',
39-
ALL_TIMESERIES_INDEXES)
31+
all_ts = pytest.mark.parametrize(
32+
'_index_factory,_series_name,_index_start,_index_end',
33+
[DATE_RANGE, PERIOD_RANGE, TIMEDELTA_RANGE]
34+
)
4035

4136

4237
@pytest.fixture
@@ -84,7 +79,8 @@ def test_asfreq_fill_value(series, create_index):
8479
assert_frame_equal(result, expected)
8580

8681

87-
def test_resample_interpolate_all_ts(frame):
82+
@all_ts
83+
def test_resample_interpolate(frame):
8884
# # 12925
8985
df = frame
9086
assert_frame_equal(
@@ -101,8 +97,9 @@ def test_raises_on_non_datetimelike_index():
10197
xp.resample('A').mean()
10298

10399

100+
@all_ts
104101
@pytest.mark.parametrize('freq', ['M', 'D', 'H'])
105-
def test_resample_empty_series_all_ts(freq, empty_series, resample_method):
102+
def test_resample_empty_series(freq, empty_series, resample_method):
106103
# GH12771 & GH12868
107104

108105
if resample_method == 'ohlc':
@@ -121,8 +118,9 @@ def test_resample_empty_series_all_ts(freq, empty_series, resample_method):
121118
assert_series_equal(result, expected, check_dtype=False)
122119

123120

121+
@all_ts
124122
@pytest.mark.parametrize('freq', ['M', 'D', 'H'])
125-
def test_resample_empty_dataframe_all_ts(empty_frame, freq, resample_method):
123+
def test_resample_empty_dataframe(empty_frame, freq, resample_method):
126124
# GH13212
127125
df = empty_frame
128126
# count retains dimensions too
@@ -162,7 +160,8 @@ def test_resample_empty_dtypes(index, dtype, resample_method):
162160
pass
163161

164162

165-
def test_resample_loffset_arg_type_all_ts(frame, create_index):
163+
@all_ts
164+
def test_resample_loffset_arg_type(frame, create_index):
166165
# GH 13218, 15002
167166
df = frame
168167
expected_means = [df.values[i:i + 2].mean()
@@ -202,7 +201,8 @@ def test_resample_loffset_arg_type_all_ts(frame, create_index):
202201
assert_frame_equal(result_how, expected)
203202

204203

205-
def test_apply_to_empty_series_all_ts(empty_series):
204+
@all_ts
205+
def test_apply_to_empty_series(empty_series):
206206
# GH 14313
207207
s = empty_series
208208
for freq in ['M', 'D', 'H']:
@@ -212,7 +212,8 @@ def test_apply_to_empty_series_all_ts(empty_series):
212212
assert_series_equal(result, expected, check_dtype=False)
213213

214214

215-
def test_resampler_is_iterable_all_ts(series):
215+
@all_ts
216+
def test_resampler_is_iterable(series):
216217
# GH 15314
217218
freq = 'H'
218219
tg = TimeGrouper(freq, convention='start')
@@ -223,7 +224,8 @@ def test_resampler_is_iterable_all_ts(series):
223224
assert_series_equal(rv, gv)
224225

225226

226-
def test_resample_quantile_all_ts(series):
227+
@all_ts
228+
def test_resample_quantile(series):
227229
# GH 15023
228230
s = series
229231
q = 0.75

0 commit comments

Comments
 (0)