Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #25262 on branch 0.24.x (REF/TST: resample/test_base.py) #25718

Merged
merged 1 commit into from
Mar 26, 2019
Merged

Backport PR #25262 on branch 0.24.x (REF/TST: resample/test_base.py) #25718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions pandas/tests/resample/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,10 @@
period_range, 'pi', datetime(2005, 1, 1), datetime(2005, 1, 10))
TIMEDELTA_RANGE = (timedelta_range, 'tdi', '1 day', '10 day')

ALL_TIMESERIES_INDEXES = [DATE_RANGE, PERIOD_RANGE, TIMEDELTA_RANGE]


def pytest_generate_tests(metafunc):
# called once per each test function
if metafunc.function.__name__.endswith('_all_ts'):
metafunc.parametrize(
'_index_factory,_series_name,_index_start,_index_end',
ALL_TIMESERIES_INDEXES)
all_ts = pytest.mark.parametrize(
'_index_factory,_series_name,_index_start,_index_end',
[DATE_RANGE, PERIOD_RANGE, TIMEDELTA_RANGE]
)


@pytest.fixture
Expand Down Expand Up @@ -84,7 +79,8 @@ def test_asfreq_fill_value(series, create_index):
assert_frame_equal(result, expected)


def test_resample_interpolate_all_ts(frame):
@all_ts
def test_resample_interpolate(frame):
# # 12925
df = frame
assert_frame_equal(
Expand All @@ -98,8 +94,9 @@ def test_raises_on_non_datetimelike_index():
pytest.raises(TypeError, lambda: xp.resample('A').mean())


@all_ts
@pytest.mark.parametrize('freq', ['M', 'D', 'H'])
def test_resample_empty_series_all_ts(freq, empty_series, resample_method):
def test_resample_empty_series(freq, empty_series, resample_method):
# GH12771 & GH12868

if resample_method == 'ohlc':
Expand All @@ -118,8 +115,9 @@ def test_resample_empty_series_all_ts(freq, empty_series, resample_method):
assert_series_equal(result, expected, check_dtype=False)


@all_ts
@pytest.mark.parametrize('freq', ['M', 'D', 'H'])
def test_resample_empty_dataframe_all_ts(empty_frame, freq, resample_method):
def test_resample_empty_dataframe(empty_frame, freq, resample_method):
# GH13212
df = empty_frame
# count retains dimensions too
Expand Down Expand Up @@ -159,7 +157,8 @@ def test_resample_empty_dtypes(index, dtype, resample_method):
pass


def test_resample_loffset_arg_type_all_ts(frame, create_index):
@all_ts
def test_resample_loffset_arg_type(frame, create_index):
# GH 13218, 15002
df = frame
expected_means = [df.values[i:i + 2].mean()
Expand Down Expand Up @@ -197,7 +196,8 @@ def test_resample_loffset_arg_type_all_ts(frame, create_index):
assert_frame_equal(result_how, expected)


def test_apply_to_empty_series_all_ts(empty_series):
@all_ts
def test_apply_to_empty_series(empty_series):
# GH 14313
s = empty_series
for freq in ['M', 'D', 'H']:
Expand All @@ -207,7 +207,8 @@ def test_apply_to_empty_series_all_ts(empty_series):
assert_series_equal(result, expected, check_dtype=False)


def test_resampler_is_iterable_all_ts(series):
@all_ts
def test_resampler_is_iterable(series):
# GH 15314
freq = 'H'
tg = TimeGrouper(freq, convention='start')
Expand All @@ -218,7 +219,8 @@ def test_resampler_is_iterable_all_ts(series):
assert_series_equal(rv, gv)


def test_resample_quantile_all_ts(series):
@all_ts
def test_resample_quantile(series):
# GH 15023
s = series
q = 0.75
Expand Down