Skip to content

Fix stubname equal suffix in wide to long function #57868

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -647,6 +647,7 @@ Categorical

Datetimelike
^^^^^^^^^^^^
- Bug in :attr:`Series.dt.date` returned datetime dtype on Series with all NaT values; now returns object dtype (:issue:`61188`)
- Bug in :attr:`is_year_start` where a DateTimeIndex constructed via a date_range with frequency 'MS' wouldn't have the correct year or quarter start attributes (:issue:`57377`)
- Bug in :class:`DataFrame` raising ``ValueError`` when ``dtype`` is ``timedelta64`` and ``data`` is a list containing ``None`` (:issue:`60064`)
- Bug in :class:`Timestamp` constructor failing to raise when ``tz=None`` is explicitly specified in conjunction with timezone-aware ``tzinfo`` or data (:issue:`48688`)
Expand Down
4 changes: 3 additions & 1 deletion pandas/core/indexes/accessors.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def _delegate_property_get(self, name: str):
else:
index = self._parent.index
# return the result as a Series
return Series(result, index=index, name=self.name).__finalize__(self._parent)
return Series(
result, index=index, name=self.name, dtype=result.dtype
).__finalize__(self._parent)

def _delegate_property_set(self, name: str, value, *args, **kwargs) -> NoReturn:
raise ValueError(
Expand Down
8 changes: 7 additions & 1 deletion pandas/core/reshape/melt.py
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,9 @@ def get_var_names(df, stub: str, sep: str, suffix: str):
return df.columns[df.columns.str.match(regex)]

def melt_stub(df, stub: str, i, j, value_vars, sep: str):
# Ensure value_name and var_name are different when passing to melt
j_original = j
j = f"{j}_1" if stub == j else j
newdf = melt(
df,
id_vars=i,
Expand All @@ -632,7 +635,10 @@ def melt_stub(df, stub: str, i, j, value_vars, sep: str):
# TODO: anything else to catch?
pass

return newdf.set_index(i + [j])
newdf = newdf.set_index(i + [j])
if j != j_original:
newdf.index = newdf.index.set_names(j_original, level=-1)
return newdf

if not is_list_like(stubnames):
stubnames = [stubnames]
Expand Down
27 changes: 27 additions & 0 deletions pandas/tests/reshape/test_melt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1241,6 +1241,33 @@ def test_missing_stubname(self, any_string_dtype):
expected.index = expected.index.set_levels(new_level, level=0)
tm.assert_frame_equal(result, expected)

@pytest.mark.parametrize("stubnames", ["year", ["year"]])
def test_stubname_equal_suffix(self, stubnames):
# https://github.com/pandas-dev/pandas/issues/46939
df = DataFrame(
{
"year1": {0: 4.5, 1: 1.7},
"year2": {0: 2.5, 1: 1.2},
"X": dict(zip(range(2), range(2, 4))),
}
)
df["id"] = df.index
result = wide_to_long(
df,
stubnames=stubnames,
i="id",
j="year",
)
expected = DataFrame(
[[2, 4.5], [3, 1.7], [2, 2.5], [3, 1.2]],
columns=["X", "year"],
index=pd.MultiIndex.from_arrays(
[[0, 1, 0, 1], [1, 1, 2, 2]],
names=["id", "year"],
),
)
tm.assert_frame_equal(result, expected)


def test_wide_to_long_string_columns(string_storage):
# GH 57066
Expand Down
20 changes: 20 additions & 0 deletions pandas/tests/series/indexing/test_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -491,3 +491,23 @@ def test_compare_datetime_with_all_none():
result = ser > ser2
expected = Series([False, False])
tm.assert_series_equal(result, expected)


def test_dt_date_dtype_all_nat_is_object():
# Ensure .dt.date on all-NaT Series returns object dtype and not datetime64
# GH#61188
s = Series([pd.NaT, pd.NaT], dtype="datetime64[s]")
result = s.dt.date

expected = Series([pd.NaT, pd.NaT], dtype=object)

tm.assert_series_equal(result, expected)


def test_dt_date_all_nat_le_date():
# All-NaT Series should not raise error when compared to a datetime.date
# GH#61188
s = Series([pd.NaT, pd.NaT], dtype="datetime64[s]")
result = s.dt.date <= datetime.now().date()
expected = Series([False, False])
tm.assert_series_equal(result, expected)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading