Skip to content

REF/TST: Add more pytest idiom to resample/test_base.py #24377

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

Merged
merged 9 commits into from
Dec 23, 2018
Merged

REF/TST: Add more pytest idiom to resample/test_base.py #24377

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dceb8bc
parametrize base class tests individually
simonjayhawkins Dec 20, 2018
d8c71ab
reduce duplication
simonjayhawkins Dec 21, 2018
d818b84
add pytest_generate_tests
simonjayhawkins Dec 22, 2018
9b32091
use frame fixture
simonjayhawkins Dec 22, 2018
c25b33c
create empty_series fixture
simonjayhawkins Dec 22, 2018
3a8d8b1
create empty_frame fixture
simonjayhawkins Dec 22, 2018
4e110bb
Merge remote-tracking branch 'upstream/master' into resample-base-alt
simonjayhawkins Dec 22, 2018
6da8252
add code comment
simonjayhawkins Dec 23, 2018
f7092c2
replace non-ASCII characters
simonjayhawkins Dec 23, 2018
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
14 changes: 13 additions & 1 deletion pandas/tests/resample/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,22 @@ def series(index, _series_name, _static_values):


@pytest.fixture
def frame(index, _static_values):
def empty_series(series):
return series[:0]


@pytest.fixture
def frame(index, _series_name, _static_values):
# _series_name is intentionally unused
return DataFrame({'value': _static_values}, index=index)


@pytest.fixture
def empty_frame(series):
index = series.index[:0]
return DataFrame(index=index)


@pytest.fixture(params=[Series, DataFrame])
def series_and_frame(request, series, frame):
if request.param == Series:
Expand Down
Loading