Skip to content

Add missing __finalize__ calls in indexers/iterators #46101

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 9 commits into from
Apr 26, 2022
Merged

Add missing __finalize__ calls in indexers/iterators #46101

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efb61c5
add missing __finalize__ calls in indexers/iterators
theOehrly Feb 21, 2022
5c3350c
fix tests (un-xfail)
theOehrly Feb 22, 2022
1236fc2
fix typing validation error
theOehrly Feb 22, 2022
010fe77
add release note
theOehrly Feb 26, 2022
e2645bc
merge upstream/main
theOehrly Apr 3, 2022
f75a5dd
fix test failures
theOehrly Apr 4, 2022
d4372aa
move release note to 1.5.0
theOehrly Apr 12, 2022
d4909a9
Merge remote-tracking branch 'upstream/main' into finalize_indexers_i…
theOehrly Apr 12, 2022
8a01df9
Merge branch 'main' into finalize_indexers_iterators
jreback Apr 26, 2022
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
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v1.4.3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Fixed regressions

Bug fixes
~~~~~~~~~
-
- Fixed metadata propagation in :meth:`NDFrame.xs`, :meth:`DataFrame.iterrows`, :meth:`DataFrame.loc` and :meth:`DataFrame.iloc` (:issue:`28283`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls move to 1.5

-

.. ---------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ def iterrows(self) -> Iterable[tuple[Hashable, Series]]:
columns = self.columns
klass = self._constructor_sliced
for k, v in zip(self.index, self.values):
s = klass(v, index=columns, name=k)
s = klass(v, index=columns, name=k).__finalize__(self)
yield k, s

def itertuples(
Expand Down Expand Up @@ -3453,7 +3453,7 @@ def _ixs(self, i: int, axis: int = 0):
index=self.columns,
name=self.index[i],
dtype=new_values.dtype,
)
).__finalize__(self)
result._set_is_copy(self, copy=copy)
return result

Expand Down
2 changes: 1 addition & 1 deletion pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3816,7 +3816,7 @@ class animal locomotion
index=self.columns,
name=self.index[loc],
dtype=new_values.dtype,
)
).__finalize__(self)
elif is_scalar(loc):
result = self.iloc[:, slice(loc, loc + 1)]
elif axis == 1:
Expand Down
9 changes: 2 additions & 7 deletions pandas/tests/generic/test_duplicate_labels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def test_binops(self, func, other, frame):
assert df.flags.allows_duplicate_labels is False
assert func(df).flags.allows_duplicate_labels is False

@not_implemented
def test_preserve_getitem(self):
df = pd.DataFrame({"A": [1, 2]}).set_flags(allows_duplicate_labels=False)
assert df[["A"]].flags.allows_duplicate_labels is False
Expand Down Expand Up @@ -306,15 +305,11 @@ def test_series_raises(self):
(operator.itemgetter(["A", "A"]), None),
# loc
(operator.itemgetter(["a", "a"]), "loc"),
pytest.param(
operator.itemgetter(("a", ["A", "A"])), "loc", marks=not_implemented
),
pytest.param(operator.itemgetter(("a", ["A", "A"])), "loc"),
(operator.itemgetter((["a", "a"], "A")), "loc"),
# iloc
(operator.itemgetter([0, 0]), "iloc"),
pytest.param(
operator.itemgetter((0, [0, 0])), "iloc", marks=not_implemented
),
pytest.param(operator.itemgetter((0, [0, 0])), "iloc"),
pytest.param(operator.itemgetter(([0, 0], 0)), "iloc"),
],
)
Expand Down
6 changes: 2 additions & 4 deletions pandas/tests/generic/test_finalize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@
frame_data,
operator.methodcaller("quantile", numeric_only=True),
),
marks=not_implemented_mark,
),
pytest.param(
(
Expand All @@ -265,10 +264,9 @@
pytest.param(
(
pd.DataFrame,
frame_data,
operator.methodcaller("quantile", numeric_only=True),
({"A": [pd.Timedelta(days=1), pd.Timedelta(days=2)]},),
operator.methodcaller("quantile", numeric_only=False),
),
marks=not_implemented_mark,
),
(
pd.DataFrame,
Expand Down