Skip to content

COMPAT: matplotlib 3.4.0 #40718

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 8 commits into from
Apr 1, 2021
Merged

COMPAT: matplotlib 3.4.0 #40718

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d5af71
COMPAT: matplotlib 3.4.0
jbrockmendel Apr 1, 2021
e8022b4
revert accidental
jbrockmendel Apr 1, 2021
2c63792
fail
jbrockmendel Apr 1, 2021
8d9aee8
lazify import
jbrockmendel Apr 1, 2021
b376a25
Merge branch 'master' into ci-mpl
jbrockmendel Apr 1, 2021
e1b2c3b
mpl_ge_3_4_0 is callable
jbrockmendel Apr 1, 2021
58bbfc2
fixup mpl_ge_3_4_0 is callable
jbrockmendel Apr 1, 2021
168c3de
update test
jorisvandenbossche Apr 1, 2021
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
Prev Previous commit
Next Next commit
revert accidental
  • Loading branch information
@jbrockmendel
jbrockmendel committed Apr 1, 2021
commit e8022b49d712a631ff152070b0ad9c6bb20bcee6
4 changes: 1 addition & 3 deletions pandas/core/groupby/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def apply(self, f: F, data: FrameOrSeries, axis: int = 0):
# TODO(ArrayManager) don't use fast_apply / libreduction.apply_frame_axis0
# for now -> relies on BlockManager internals
pass
elif False and (
elif (
com.get_callable_name(f) not in base.plotting_methods
and isinstance(splitter, FrameSplitter)
and axis == 0
Expand All @@ -293,7 +293,6 @@ def apply(self, f: F, data: FrameOrSeries, axis: int = 0):
if len(result_values) == len(group_keys):
return group_keys, result_values, mutated

# This is where __iter__ is called
for key, (i, group) in zip(group_keys, splitter):
object.__setattr__(group, "name", key)

Expand All @@ -308,7 +307,6 @@ def apply(self, f: F, data: FrameOrSeries, axis: int = 0):
# fast apply loop was broken prematurely but we have
# already the result for the first group which we can reuse.
elif i == 0:
assert False
continue

# group might be modified
Expand Down