Skip to content

Conversation

@simonjayhawkins
Copy link
Member

Backport PR #38057

@simonjayhawkins simonjayhawkins added Groupby Performance Memory or execution speed performance labels Dec 1, 2020
@simonjayhawkins simonjayhawkins added this to the 1.1.5 milestone Dec 1, 2020
@simonjayhawkins simonjayhawkins added the Window rolling, ewma, expanding label Dec 1, 2020
@simonjayhawkins
Copy link
Member Author

@jorisvandenbossche there were several merge conflicts. If you can give this a quick once over before I merge.

location of tests are different pandas/tests/window/test_groupby.py vs pandas/tests/window/test_grouper.py
changes to test_groupby_rolling_nan_included not needed, added in #36842 and not on 1.1.x
class hierarchy has changed, changes to _apply in RollingGroupby instead of BaseWindowGroupby

Copy link
Member

@jorisvandenbossche jorisvandenbossche left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thanks for the backport

@simonjayhawkins simonjayhawkins merged commit 993557b into pandas-dev:1.1.x Dec 1, 2020
@simonjayhawkins simonjayhawkins deleted the backport-of-pr-38057-on-1.1.x branch December 1, 2020 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Groupby Performance Memory or execution speed performance Window rolling, ewma, expanding

2 participants