Skip to content

REVERT caching in find_stack_level #49053

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

Jump to bottom
Merged
merged 1 commit into from
Oct 14, 2022
Merged

REVERT caching in find_stack_level #49053

merged 1 commit into from
Oct 14, 2022

Conversation

MarcoGorelli
Copy link
Member

addresses #48023 (comment)

@MarcoGorelli MarcoGorelli added the Warnings Warnings that appear or should be added to pandas label Oct 12, 2022
@MarcoGorelli MarcoGorelli added this to the 1.5.1 milestone Oct 12, 2022
@MarcoGorelli MarcoGorelli marked this pull request as ready for review October 12, 2022 10:23
mroeschke
mroeschke approved these changes Oct 12, 2022
View reviewed changes
Copy link
Member

@mroeschke mroeschke left a comment

Choose a reason for hiding this comment

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

Confirming this is essentially a pure git revert of #48023?

@MarcoGorelli
Copy link
Member Author

It undoes #48023, but I did it manually instead of with git revert as there were too many conflicts to deal with

@MarcoGorelli MarcoGorelli marked this pull request as draft October 13, 2022 20:21
@MarcoGorelli MarcoGorelli force-pushed the revert-cache-stacklevel branch from e4602a1 to 746db2a Compare October 13, 2022 20:35
@MarcoGorelli MarcoGorelli marked this pull request as ready for review October 13, 2022 20:37
@MarcoGorelli MarcoGorelli force-pushed the revert-cache-stacklevel branch from 746db2a to 07a99e6 Compare October 13, 2022 20:49
@MarcoGorelli
Copy link
Member Author

It undoes #48023, but I did it manually instead of with git revert as there were too many conflicts to deal with

I did this again with git revert and braved all the conflicts, to be safer. Also checked through the whole diff and it looks fine

@MarcoGorelli MarcoGorelli merged commit 0106c26 into pandas-dev:main Oct 14, 2022
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 14, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.5.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 0106c26529900bad0561efb9c9180f7f016365b0
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #49053: REVERT caching in find_stack_level'
  1. Push to a named branch:
git push YOURFORK 1.5.x:auto-backport-of-pr-49053-on-1.5.x
  1. Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #49053 on branch 1.5.x (REVERT caching in find_stack_level)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

MarcoGorelli added a commit to MarcoGorelli/pandas that referenced this pull request Oct 14, 2022
@MarcoGorelli
REVERT caching in find_stack_level (pandas-dev#49053)
c677ae4 
Revert "PERF cache find_stack_level (pandas-dev#48023)"

This reverts commit 2f8d0a3.

Co-authored-by: MarcoGorelli <>
(cherry picked from commit 0106c26)
@phofl phofl mentioned this pull request Oct 14, 2022
Merged
5 tasks
phofl pushed a commit that referenced this pull request Oct 14, 2022
@MarcoGorelli
Backport PR #49053 on branch 1.5.x (REVERT caching in find_stack_leve…
072402b 
…l) (#49079)
This was referenced Oct 18, 2022
Closed
Closed
noatamir pushed a commit to noatamir/pandas that referenced this pull request Nov 9, 2022
@MarcoGorelli @noatamir
REVERT caching in find_stack_level (pandas-dev#49053)
077ff18 
Revert "PERF cache find_stack_level (pandas-dev#48023)"

This reverts commit 2f8d0a3.

Co-authored-by: MarcoGorelli <>
aresnow1 added a commit to aresnow1/mars that referenced this pull request Dec 19, 2022
@aresnow1
Revert changes caused by Pandas as it was fixed in pandas-dev/pandas#…
b66358d 
…49053
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mroeschke mroeschke mroeschke approved these changes

Assignees
No one assigned
Labels
Warnings Warnings that appear or should be added to pandas
Projects
None yet
Milestone
1.5.1
Development

Successfully merging this pull request may close these issues.
2 participants
@MarcoGorelli @mroeschke