Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a9c8d85
Initial test case
eicchen Jul 10, 2025
f303a04
Updated test case to account for results of mul being NaN if both inp…
eicchen Jul 10, 2025
5ac26a4
Removed test cases which expect an error from fill_value
eicchen Jul 10, 2025
a60fbb0
Updated test case to include other operators which included fill_value
eicchen Jul 10, 2025
87ecfc4
Removed restriction on using fill_value with series
eicchen Jul 10, 2025
bc805fd
Included PR suggestions, added seperate dtype test (WIP)
eicchen Jul 15, 2025
be09616
temp files
eicchen Jul 16, 2025
1ebcf6e
Added test case to test EA and NUMPY dtypes
eicchen Aug 18, 2025
98fb07f
Merge branch 'pandas-dev:main' into BUG-#61581-DataFrame.mul
eicchen Aug 19, 2025
a5940d5
addressed changes brought up in PR, converted test cases to not use n…
eicchen Aug 21, 2025
dcf3391
Limit np conversion to IntegerArray and FloatArray
eicchen Aug 21, 2025
1179098
Updated EA catch method in _maybe_align_series_as_frame
eicchen Aug 21, 2025
2dfb4bf
Addressed errors from changes in som tests
eicchen Aug 21, 2025
ce0b2ef
removed comment and errant print statement
eicchen Aug 21, 2025
eaac655
Commented out test_add_frame's xfail to test CI
eicchen Aug 23, 2025
a719a1d
Allows frames to be added to strings, with modifications to tests tha…
eicchen Aug 25, 2025
06bcebc
Merge branch 'main' into BUG-#61581-DataFrame.mul
eicchen Aug 25, 2025
801b39e
Moved type conversion within add and radd if statement, removed datea…
eicchen Aug 26, 2025
4be6817
Removed PeriodArray special casing and modified test case
eicchen Aug 27, 2025
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,7 @@ MultiIndex
- :func:`MultiIndex.get_level_values` accessing a :class:`DatetimeIndex` does not carry the frequency attribute along (:issue:`58327`, :issue:`57949`)
- Bug in :class:`DataFrame` arithmetic operations in case of unaligned MultiIndex columns (:issue:`60498`)
- Bug in :class:`DataFrame` arithmetic operations with :class:`Series` in case of unaligned MultiIndex (:issue:`61009`)
- Bug in :class:`DataFrame` arithmetic operations with :class:`Series` now works with ``fill_value`` parameter (:issue:`61581`)
- Bug in :meth:`MultiIndex.from_tuples` causing wrong output with input of type tuples having NaN values (:issue:`60695`, :issue:`60988`)
- Bug in :meth:`DataFrame.reindex` and :meth:`Series.reindex` where reindexing :class:`Index` to a :class:`MultiIndex` would incorrectly set all values to ``NaN``.(:issue:`60923`)

Expand Down
15 changes: 7 additions & 8 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
notna,
)

from pandas.arrays import (
FloatingArray,
IntegerArray,
)
from pandas.core import (
algorithms,
common as com,
Expand Down Expand Up @@ -8444,9 +8448,9 @@ def _maybe_align_series_as_frame(self, series: Series, axis: AxisInt):
"""
rvalues = series._values
if not isinstance(rvalues, np.ndarray):
# TODO(EA2D): no need to special-case with 2D EAs
if rvalues.dtype in ("datetime64[ns]", "timedelta64[ns]"):
# We can losslessly+cheaply cast to ndarray
if rvalues.dtype in ("datetime64[ns]", "timedelta64[ns]") or isinstance(
rvalues, (IntegerArray, FloatingArray)
):
rvalues = np.asarray(rvalues)
else:
return series
Expand All @@ -8473,11 +8477,6 @@ def _flex_arith_method(
if self._should_reindex_frame_op(other, op, axis, fill_value, level):
return self._arith_method_with_reindex(other, op)

if isinstance(other, Series) and fill_value is not None:
# TODO: We could allow this in cases where we end up going
# through the DataFrame path
raise NotImplementedError(f"fill_value {fill_value} not supported.")

other = ops.maybe_prepare_scalar_for_op(other, self.shape)
self, other = self._align_for_op(other, axis, flex=True, level=level)

Expand Down
77 changes: 58 additions & 19 deletions pandas/tests/frame/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -626,12 +626,6 @@ def test_arith_flex_frame_corner(self, float_frame):
expected = float_frame.sort_index() * np.nan
tm.assert_frame_equal(result, expected)

with pytest.raises(NotImplementedError, match="fill_value"):
float_frame.add(float_frame.iloc[0], fill_value=3)

with pytest.raises(NotImplementedError, match="fill_value"):
float_frame.add(float_frame.iloc[0], axis="index", fill_value=3)

@pytest.mark.parametrize("op", ["add", "sub", "mul", "mod"])
def test_arith_flex_series_ops(self, simple_frame, op):
# after arithmetic refactor, add truediv here
Expand Down Expand Up @@ -665,19 +659,6 @@ def test_arith_flex_series_broadcasting(self, any_real_numpy_dtype):
result = df.div(df[0], axis="index")
tm.assert_frame_equal(result, expected)

def test_arith_flex_zero_len_raises(self):
# GH 19522 passing fill_value to frame flex arith methods should
# raise even in the zero-length special cases
ser_len0 = Series([], dtype=object)
df_len0 = DataFrame(columns=["A", "B"])
df = DataFrame([[1, 2], [3, 4]], columns=["A", "B"])

with pytest.raises(NotImplementedError, match="fill_value"):
df.add(ser_len0, fill_value="E")

with pytest.raises(NotImplementedError, match="fill_value"):
df_len0.sub(df["A"], axis=None, fill_value=3)

def test_flex_add_scalar_fill_value(self):
# GH#12723
dat = np.array([0, 1, np.nan, 3, 4, 5], dtype="float")
Expand Down Expand Up @@ -2192,3 +2173,61 @@ def test_mixed_col_index_dtype(string_dtype_no_object):
expected.columns = expected.columns.astype(string_dtype_no_object)

tm.assert_frame_equal(result, expected)


dt_params = [
(tm.ALL_INT_NUMPY_DTYPES[0], 5),
(tm.ALL_INT_EA_DTYPES[0], 5),
(tm.FLOAT_NUMPY_DTYPES[0], 4.9),
(tm.FLOAT_EA_DTYPES[0], 4.9),
]

axes = [0, 1]


@pytest.mark.parametrize(
"data_type,fill_val, axis",
[(dt, val, axis) for axis in axes for dt, val in dt_params],
)
def test_df_fill_value_dtype(data_type, fill_val, axis):
# GH 61581
base_data = np.arange(25).reshape(5, 5)
mult_list = [1, np.nan, 5, np.nan, 3]
np_int_flag = 0

try:
mult_data = pd.array(mult_list, dtype=data_type)
except ValueError as e:
# Numpy int type cannot represent NaN, it will end up here
if "cannot convert float NaN to integer" in str(e):
mult_data = np.asarray(mult_list)
np_int_flag = 1

columns = list("ABCDE")
df = DataFrame(base_data, columns=columns)

for i in range(df.shape[0]):
try:
df.iat[i, i] = np.nan
df.iat[i + 1, i] = pd.NA
df.iat[i + 3, i] = pd.NA
except IndexError:
pass

mult_mat = np.broadcast_to(mult_data, df.shape)
if axis == 0:
mask = np.isnan(mult_mat).T
else:
mask = np.isnan(mult_mat)
mask = df.isna().values & mask

df_result = df.mul(mult_data, axis=axis, fill_value=fill_val)
if np_int_flag == 1:
mult_np = np.nan_to_num(mult_data, nan=fill_val)
df_expected = (df.fillna(fill_val).mul(mult_np, axis=axis)).mask(mask, np.nan)
else:
df_expected = (
df.fillna(fill_val).mul(mult_data.fillna(fill_val), axis=axis)
).mask(mask, np.nan)

tm.assert_frame_equal(df_result, df_expected)
Loading