Skip to content

Commit b257ab6

Browse files
committed
1 parent 1f81f47 commit b257ab6

File tree

2 files changed

+60
-63
lines changed

2 files changed

+60
-63
lines changed

pandas/tests/series/methods/test_compare.py

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
from enum import (
2-
Enum,
3-
auto,
4-
)
5-
61
import numpy as np
72
import pytest
83

@@ -143,61 +138,3 @@ def test_compare_datetime64_and_string():
143138
tm.assert_series_equal(result_eq1, expected_eq)
144139
tm.assert_series_equal(result_eq2, expected_eq)
145140
tm.assert_series_equal(result_neq, expected_neq)
146-
147-
148-
def test_eq_objects():
149-
# GH#62191 Test eq with Enum and List elements
150-
151-
class Thing(Enum):
152-
FIRST = auto()
153-
SECOND = auto()
154-
155-
left = pd.Series([Thing.FIRST, Thing.SECOND])
156-
py_l = [Thing.FIRST, Thing.SECOND]
157-
158-
result = left.eq(Thing.FIRST)
159-
expected = pd.Series([True, False])
160-
tm.assert_series_equal(result, expected)
161-
162-
result = left.eq(py_l)
163-
expected = pd.Series([True, True])
164-
tm.assert_series_equal(result, expected)
165-
166-
result = left.eq(np.asarray(py_l))
167-
expected = pd.Series([True, True])
168-
tm.assert_series_equal(result, expected)
169-
170-
result = left.eq(pd.Series(py_l))
171-
expected = pd.Series([True, True])
172-
tm.assert_series_equal(result, expected)
173-
174-
result = pd.Series([[1, 2], [3, 4]]).eq([1, 2])
175-
expected = pd.Series([True, False])
176-
with pytest.raises(AssertionError):
177-
tm.assert_series_equal(result, expected)
178-
expected = pd.Series([False, False])
179-
tm.assert_series_equal(result, expected)
180-
181-
182-
def test_eq_with_index():
183-
# GH#62191 Test eq with non-trivial indices
184-
left = pd.Series([1, 2], index=[1, 0])
185-
py_l = [1, 2]
186-
187-
# assuming Python list has the same index as the Series
188-
result = left.eq(py_l)
189-
expected = pd.Series([True, True], index=[1, 0])
190-
tm.assert_series_equal(result, expected)
191-
192-
# assuming np.ndarray has the same index as the Series
193-
result = left.eq(np.asarray(py_l))
194-
expected = pd.Series([True, True], index=[1, 0])
195-
tm.assert_series_equal(result, expected)
196-
197-
result = left.eq(pd.Series(py_l))
198-
expected = pd.Series([False, False])
199-
tm.assert_series_equal(result, expected)
200-
201-
result = left.eq(pd.Series([2, 1]))
202-
expected = pd.Series([True, True])
203-
tm.assert_series_equal(result, expected)

pandas/tests/series/test_arithmetic.py

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
timezone,
55
)
66
from decimal import Decimal
7+
from enum import (
8+
Enum,
9+
auto,
10+
)
711
import operator
812

913
import numpy as np
@@ -426,6 +430,62 @@ def test_comparison_flex_alignment_fill(self, values, op, fill_value):
426430
expected = Series(values, index=list("abcd"))
427431
tm.assert_series_equal(result, expected)
428432

433+
def test_eq_objects(self) -> None:
434+
# GH#62191 Test eq with Enum and List elements
435+
436+
class Thing(Enum):
437+
FIRST = auto()
438+
SECOND = auto()
439+
440+
left = pd.Series([Thing.FIRST, Thing.SECOND])
441+
py_l = [Thing.FIRST, Thing.SECOND]
442+
443+
result = left.eq(Thing.FIRST)
444+
expected = pd.Series([True, False])
445+
tm.assert_series_equal(result, expected)
446+
447+
result = left.eq(py_l)
448+
expected = pd.Series([True, True])
449+
tm.assert_series_equal(result, expected)
450+
451+
result = left.eq(np.asarray(py_l))
452+
expected = pd.Series([True, True])
453+
tm.assert_series_equal(result, expected)
454+
455+
result = left.eq(pd.Series(py_l))
456+
expected = pd.Series([True, True])
457+
tm.assert_series_equal(result, expected)
458+
459+
result = pd.Series([[1, 2], [3, 4]]).eq([1, 2])
460+
expected = pd.Series([True, False])
461+
with pytest.raises(AssertionError):
462+
tm.assert_series_equal(result, expected)
463+
expected = pd.Series([False, False])
464+
tm.assert_series_equal(result, expected)
465+
466+
def test_eq_with_index(self) -> None:
467+
# GH#62191 Test eq with non-trivial indices
468+
left = pd.Series([1, 2], index=[1, 0])
469+
py_l = [1, 2]
470+
471+
# assuming Python list has the same index as the Series
472+
result = left.eq(py_l)
473+
expected = pd.Series([True, True], index=[1, 0])
474+
tm.assert_series_equal(result, expected)
475+
476+
# assuming np.ndarray has the same index as the Series
477+
result = left.eq(np.asarray(py_l))
478+
expected = pd.Series([True, True], index=[1, 0])
479+
tm.assert_series_equal(result, expected)
480+
481+
result = left.eq(pd.Series(py_l))
482+
expected = pd.Series([False, False])
483+
tm.assert_series_equal(result, expected)
484+
485+
result = left.eq(pd.Series([2, 1]))
486+
expected = pd.Series([True, True])
487+
tm.assert_series_equal(result, expected)
488+
429489

430490
class TestSeriesComparison:
431491
def test_comparison_different_length(self):

0 commit comments

Comments
 (0)