Skip to content

BUG: Too aggressive typing in NDFrame.align #31788

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 2 commits into from
Feb 9, 2020
Merged

BUG: Too aggressive typing in NDFrame.align #31788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4e7d6
BUG: Too aggressive typing NDFrame.align
topper-123 Feb 7, 2020
0a4e997
Add tests
topper-123 Feb 8, 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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.0.2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Fixed regressions
~~~~~~~~~~~~~~~~~

- Fixed regression in :meth:`DataFrame.to_excel` when ``columns`` kwarg is passed (:issue:`31677`)
- Fixed regression in :meth:`Series.align` when ``other`` is a DataFrame and ``method`` is not None (:issue:`31785`)
-

.. ---------------------------------------------------------------------------
Expand Down
4 changes: 1 addition & 3 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8360,9 +8360,7 @@ def _align_frame(
left = self._ensure_type(
left.fillna(method=method, axis=fill_axis, limit=limit)
)
right = self._ensure_type(
right.fillna(method=method, axis=fill_axis, limit=limit)
)
right = right.fillna(method=method, axis=fill_axis, limit=limit)

# if DatetimeIndex have different tz, convert to UTC
if is_datetime64tz_dtype(left.index):
Expand Down
11 changes: 11 additions & 0 deletions pandas/tests/series/indexing/test_alter_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@ def test_align_multiindex():
tm.assert_series_equal(expr, res2l)


@pytest.mark.parametrize("method", ["backfill", "bfill", "pad", "ffill", None])
def test_align_method(method):
# GH31788
ser = pd.Series(range(3), index=range(3))
df = pd.DataFrame(0.0, index=range(3), columns=range(3))

result_ser, result_df = ser.align(df, method=method)
tm.assert_series_equal(result_ser, ser)
tm.assert_frame_equal(result_df, df)


def test_reindex(datetime_series, string_series):
identity = string_series.reindex(string_series.index)

Expand Down