Skip to content

CLN: Clean series/test_arithmetic.py #36406

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 4 commits into from
Sep 17, 2020
Merged

CLN: Clean series/test_arithmetic.py #36406

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
251c4d4
CLN: Clean series/test_arithmetic.py
dsaxton Sep 16, 2020
0f85e3e
fixture
dsaxton Sep 16, 2020
470d33e
nit
dsaxton Sep 16, 2020
5daaa16
More
dsaxton Sep 17, 2020
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
67 changes: 30 additions & 37 deletions pandas/tests/series/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,29 +260,26 @@ def test_sub_datetimelike_align(self):


class TestSeriesFlexComparison:
def test_comparison_flex_basic(self):
@pytest.mark.parametrize("axis", [0, None, "index"])
def test_comparison_flex_basic(self, axis):
left = pd.Series(np.random.randn(10))
right = pd.Series(np.random.randn(10))

tm.assert_series_equal(left.eq(right), left == right)
tm.assert_series_equal(left.ne(right), left != right)
tm.assert_series_equal(left.le(right), left < right)
tm.assert_series_equal(left.lt(right), left <= right)
tm.assert_series_equal(left.gt(right), left > right)
tm.assert_series_equal(left.ge(right), left >= right)

for axis in [0, None, "index"]:
tm.assert_series_equal(left.eq(right, axis=axis), left == right)
tm.assert_series_equal(left.ne(right, axis=axis), left != right)
tm.assert_series_equal(left.le(right, axis=axis), left < right)
tm.assert_series_equal(left.lt(right, axis=axis), left <= right)
tm.assert_series_equal(left.gt(right, axis=axis), left > right)
tm.assert_series_equal(left.ge(right, axis=axis), left >= right)
tm.assert_series_equal(left.eq(right, axis=axis), left == right)
tm.assert_series_equal(left.ne(right, axis=axis), left != right)
tm.assert_series_equal(left.le(right, axis=axis), left < right)
tm.assert_series_equal(left.lt(right, axis=axis), left <= right)
tm.assert_series_equal(left.gt(right, axis=axis), left > right)
tm.assert_series_equal(left.ge(right, axis=axis), left >= right)

@pytest.mark.parametrize("op", ["eq", "ne", "le", "le", "gt", "ge"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you use the all_compare_operators fixture

def test_comparison_bad_axis(self, op):
left = pd.Series(np.random.randn(10))
right = pd.Series(np.random.randn(10))

msg = "No axis named 1 for object type"
for op in ["eq", "ne", "le", "le", "gt", "ge"]:
with pytest.raises(ValueError, match=msg):
getattr(left, op)(right, axis=1)
with pytest.raises(ValueError, match=msg):
getattr(left, op)(right, axis=1)

def test_comparison_flex_alignment(self):
left = Series([1, 3, 2], index=list("abc"))
Expand All @@ -306,27 +303,23 @@ def test_comparison_flex_alignment(self):
exp = pd.Series([False, True, False, False], index=list("abcd"))
tm.assert_series_equal(left.gt(right), exp)

def test_comparison_flex_alignment_fill(self):
@pytest.mark.parametrize(
"values, op, fill_value",
[
([False, False, True, True], "eq", 2),
([True, True, False, False], "ne", 2),
([False, False, True, True], "le", 0),
([False, False, False, True], "lt", 0),
([True, True, True, False], "ge", 0),
([True, True, False, False], "gt", 0),
],
)
def test_comparison_flex_alignment_fill(self, values, op, fill_value):
left = Series([1, 3, 2], index=list("abc"))
right = Series([2, 2, 2], index=list("bcd"))

exp = pd.Series([False, False, True, True], index=list("abcd"))
tm.assert_series_equal(left.eq(right, fill_value=2), exp)

exp = pd.Series([True, True, False, False], index=list("abcd"))
tm.assert_series_equal(left.ne(right, fill_value=2), exp)

exp = pd.Series([False, False, True, True], index=list("abcd"))
tm.assert_series_equal(left.le(right, fill_value=0), exp)

exp = pd.Series([False, False, False, True], index=list("abcd"))
tm.assert_series_equal(left.lt(right, fill_value=0), exp)

exp = pd.Series([True, True, True, False], index=list("abcd"))
tm.assert_series_equal(left.ge(right, fill_value=0), exp)

exp = pd.Series([True, True, False, False], index=list("abcd"))
tm.assert_series_equal(left.gt(right, fill_value=0), exp)
result = getattr(left, op)(right, fill_value=fill_value)
expected = pd.Series(values, index=list("abcd"))
tm.assert_series_equal(result, expected)


class TestSeriesComparison:
Expand Down