Merge branch 'fix-61099' of https://github.com/mayurkishorkumar/pandas into fix-61099

Author: MayurKishorKumar

.github/workflows/wheels.yml

@@ -153,7 +153,7 @@ jobs:
         run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
 
       - name: Build wheels
-        uses: pypa/[email protected].1
+        uses: pypa/[email protected].2
         with:
          package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
         env:

.gitignore

@@ -23,6 +23,7 @@
 .tags
 .cache/
 .vscode/
+.venv/
 
 # Compiled source #
 ###################

doc/source/whatsnew/v3.0.0.rst

@@ -706,6 +706,7 @@ Indexing
 - Bug in :meth:`MultiIndex.insert` when a new value inserted to a datetime-like level gets cast to ``NaT`` and fails indexing (:issue:`60388`)
 - Bug in printing :attr:`Index.names` and :attr:`MultiIndex.levels` would not escape single quotes (:issue:`60190`)
 - Bug in reindexing of :class:`DataFrame` with :class:`PeriodDtype` columns in case of consolidated block (:issue:`60980`, :issue:`60273`)
+- Bug in :meth:`Series.equals` and :meth:`Series.__eq__` where equality comparison would fail if the index values were equal but had differing dtypes (e.g. ``object`` vs ``string``). (:issue:`61099`)
 
 Missing
 ^^^^^^^
@@ -825,6 +826,7 @@ Other
 - Bug in :class:`DataFrame` when passing a ``dict`` with a NA scalar and ``columns`` that would always return ``np.nan`` (:issue:`57205`)
 - Bug in :class:`Series` ignoring errors when trying to convert :class:`Series` input data to the given ``dtype`` (:issue:`60728`)
 - Bug in :func:`eval` on :class:`ExtensionArray` on including division ``/`` failed with a ``TypeError``. (:issue:`58748`)
+- Bug in :func:`eval` where method calls on binary operations like ``(x + y).dropna()`` would raise ``AttributeError: 'BinOp' object has no attribute 'value'`` (:issue:`61175`)
 - Bug in :func:`eval` where the names of the :class:`Series` were not preserved when using ``engine="numexpr"``. (:issue:`10239`)
 - Bug in :func:`eval` with ``engine="numexpr"`` returning unexpected result for float division. (:issue:`59736`)
 - Bug in :func:`to_numeric` raising ``TypeError`` when ``arg`` is a :class:`Timedelta` or :class:`Timestamp` scalar. (:issue:`59944`)

pandas/core/computation/expr.py

@@ -644,7 +644,11 @@ def visit_Attribute(self, node, **kwargs):
         ctx = node.ctx
         if isinstance(ctx, ast.Load):
             # resolve the value
-            resolved = self.visit(value).value
+            visited_value = self.visit(value)
+            if hasattr(visited_value, "value"):
+                resolved = visited_value.value
+            else:
+                resolved = visited_value(self.env)
             try:
                 v = getattr(resolved, attr)
                 name = self.env.add_tmp(v)

pandas/core/indexes/base.py

@@ -5471,6 +5471,11 @@ def equals(self, other: Any) -> bool:
             # quickly return if the lengths are different
             return False
 
+        if (isinstance(self.dtype, StringDtype) or is_object_dtype(self.dtype)) and (
+            isinstance(other.dtype, StringDtype) or is_object_dtype(other.dtype)
+        ):
+            return array_equivalent(self._values, other._values)
+
         if (
             isinstance(self.dtype, StringDtype)
             and self.dtype.na_value is np.nan

pandas/tests/computation/test_eval.py

@@ -2006,3 +2006,24 @@ def test_eval_float_div_numexpr():
     result = pd.eval("1 / 2", engine="numexpr")
     expected = 0.5
     assert result == expected
+
+
+def test_method_calls_on_binop():
+    # GH 61175
+    x = Series([1, 2, 3, 5])
+    y = Series([2, 3, 4])
+
+    # Method call on binary operation result
+    result = pd.eval("(x + y).dropna()")
+    expected = (x + y).dropna()
+    tm.assert_series_equal(result, expected)
+
+    # Test with other binary operations
+    result = pd.eval("(x * y).dropna()")
+    expected = (x * y).dropna()
+    tm.assert_series_equal(result, expected)
+
+    # Test with method chaining
+    result = pd.eval("(x + y).dropna().reset_index(drop=True)")
+    expected = (x + y).dropna().reset_index(drop=True)
+    tm.assert_series_equal(result, expected)

pandas/tests/indexes/test_base.py

@@ -40,6 +40,7 @@
     ensure_index,
     ensure_index_from_sequences,
 )
+from pandas.testing import assert_series_equal
 
 
 class TestIndex:
@@ -1717,3 +1718,38 @@ def test_is_monotonic_pyarrow_list_type():
     idx = Index([[1], [2, 3]], dtype=pd.ArrowDtype(pa.list_(pa.int64())))
     assert not idx.is_monotonic_increasing
     assert not idx.is_monotonic_decreasing
+
+
+def test_index_equals_string_vs_object():
+    # GH 61099
+    idx1 = Index(["a", "b", "c"])
+    idx2 = Index(["a", "b", "c"], dtype="string")
+    assert idx1.equals(idx2)
+    assert idx2.equals(idx1)
+
+
+def test_compare_string_vs_object_index_equality():
+    # GH 61099
+    s1 = Series([1, 2, 3], index=["a", "b", "c"])  # dtype=object
+    s2 = Series([0, 1, 2], index=Index(["a", "b", "c"], dtype="string"))  # dtype=string
+    result = s1 > s2
+    expected = Series([True, True, True], index=["a", "b", "c"])
+    assert_series_equal(result, expected)
+
+
+def test_align_string_vs_object_index():
+    # GH 61099
+    s1 = Series([1, 2, 3], index=["a", "b", "c"])  # object
+    s2 = Series([1, 2, 3], index=Index(["a", "b", "c"], dtype="string"))  # string
+    s1_aligned, s2_aligned = s1.align(s2)
+    assert list(s1_aligned.index) == list(s2_aligned.index)
+
+
+def test_comparison_without_manual_casting():
+    # GH 61099
+    s1 = Series([1, 2, 3], index=["a", "b", "c"])  # object index
+    s2 = Series([1, 2, 3], index=Index(["a", "b", "c"], dtype="string"))
+    # Should not raise
+    result = s1 == s2
+    expected = Series([True, True, True], index=["a", "b", "c"])
+    assert_series_equal(result, expected)