Skip to content

TST: Use new arithmetic fixtures, parametrize many more tests #23757

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.

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 21 commits into from
Nov 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
327fc3f
avoid non-standard import of nan
jbrockmendel Nov 17, 2018
bb56802
box tests
jbrockmendel Nov 17, 2018
0a7bb2b
box more tests
jbrockmendel Nov 17, 2018
c0f82ba
parametrize more tests over box
jbrockmendel Nov 17, 2018
c3d3d4b
parametrize more tests over box
jbrockmendel Nov 17, 2018
3106162
keep parametrizing
jbrockmendel Nov 17, 2018
16ecc71
parametrize more tests over box
jbrockmendel Nov 17, 2018
09e10a8
collect/parametrize tests more
jbrockmendel Nov 17, 2018
4464755
box more tests
jbrockmendel Nov 17, 2018
2fa9679
GH references
jbrockmendel Nov 17, 2018
19b08e1
param over box
jbrockmendel Nov 17, 2018
ce69331
Merge branch 'master' of https://github.com/pandas-dev/pandas into bt…
jbrockmendel Nov 17, 2018
36c4842
Merge branch 'master' of https://github.com/pandas-dev/pandas into bt…
jbrockmendel Nov 17, 2018
6973bf4
use box_with_array
jbrockmendel Nov 17, 2018
6917701
Merge branch 'master' of https://github.com/pandas-dev/pandas into bt…
jbrockmendel Nov 17, 2018
72870f1
Merge branch 'master' of https://github.com/pandas-dev/pandas into bt…
jbrockmendel Nov 17, 2018
5625fd2
revert non-central changes
jbrockmendel Nov 17, 2018
d8cd073
flake8 fixups
jbrockmendel Nov 18, 2018
b4df6ea
Merge branch 'master' of https://github.com/pandas-dev/pandas into bt…
jbrockmendel Nov 18, 2018
11eda45
whatspace improvement
jbrockmendel Nov 18, 2018
d0ac7f2
less verbose
jbrockmendel Nov 18, 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
34 changes: 4 additions & 30 deletions pandas/tests/arithmetic/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import pandas as pd

from pandas.compat import long
from pandas.core.arrays import (
PeriodArray, DatetimeArrayMixin as DatetimeArray,
TimedeltaArrayMixin as TimedeltaArray)
import pandas.util.testing as tm


Expand Down Expand Up @@ -189,33 +186,6 @@ def box_transpose_fail(request):
return request.param


@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, PeriodArray],
ids=id_func)
def box_with_period(request):
"""
Like `box`, but specific to PeriodDtype for also testing PeriodArray
"""
return request.param


@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, DatetimeArray],
ids=id_func)
def box_with_datetime(request):
"""
Like `box`, but specific to datetime64 for also testing DatetimeArray
"""
return request.param


@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, TimedeltaArray],
ids=id_func)
def box_with_timedelta(request):
"""
Like `box`, but specific to timedelta64 for also testing TimedeltaArray
"""
return request.param


@pytest.fixture(params=[pd.Index, pd.Series, pd.DataFrame, tm.to_array],
ids=id_func)
def box_with_array(request):
Expand All @@ -224,3 +194,7 @@ def box_with_array(request):
classes
"""
return request.param


# alias so we can use the same fixture for multiple parameters in a test
box_with_array2 = box_with_array
Loading