Skip to content
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

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

Merged

Conversation

MarcoGorelli
Copy link
Member

@MarcoGorelli MarcoGorelli commented Oct 14, 2022

#49053

Revert "PERF cache find_stack_level (#48023)"

This reverts commit 2f8d0a3.

Co-authored-by: MarcoGorelli <>
(cherry picked from commit 0106c26)

  • closes #xxxx (Replace xxxx with the GitHub issue number)
  • Tests added and passed if fixing a bug or adding a new feature
  • All code checks passed.
  • Added type annotations to new arguments/methods/functions.
  • Added an entry in the latest doc/source/whatsnew/vX.X.X.rst file if fixing a bug or adding a new feature.

Revert "PERF cache find_stack_level (pandas-dev#48023)"

This reverts commit 2f8d0a3.

Co-authored-by: MarcoGorelli <>
(cherry picked from commit 0106c26)
@MarcoGorelli MarcoGorelli added this to the 1.5.1 milestone Oct 14, 2022
@MarcoGorelli MarcoGorelli added the Warnings Warnings that appear or should be added to pandas label Oct 14, 2022
@phofl phofl changed the title REVERT caching in find_stack_level (#49053) Backport PR #49053 on branch 1.5.x (REVERT caching in find_stack_level) Oct 14, 2022
@phofl phofl changed the title Backport PR #49053 on branch 1.5.x (REVERT caching in find_stack_level) REVERT caching in find_stack_level (#49053) Oct 14, 2022
@phofl
Copy link
Member

phofl commented Oct 14, 2022

Sorry should have asked first, so this is not really a backport?

@MarcoGorelli
Copy link
Member Author

sorry not sure what you mean, isn't it a backport?

@phofl
Copy link
Member

phofl commented Oct 14, 2022

I got a bit confused, sorry for that. Did you revert this strictly on the 1.5.x branch or did you cherry pick #49053 onto the 1.5.x branch?

@MarcoGorelli
Copy link
Member Author

I followed the instructions from #49053 (comment) - there were some conflicts to resolve

@phofl
Copy link
Member

phofl commented Oct 14, 2022

Ok got you, thx for clearing this up for me :)

@phofl phofl changed the title REVERT caching in find_stack_level (#49053) Backport PR #49053 on branch 1.5.x (REVERT caching in find_stack_level) Oct 14, 2022
@MarcoGorelli
Copy link
Member Author

no worries, thanks for checking

actually, looks like I got a different commit message than usual as, after fixing the conflicts, I did

git cherry-pick --continue

rather than

git commit -am 'Backport PR #49053: REVERT caching in find_stack_level'

@phofl
Copy link
Member

phofl commented Oct 14, 2022

It looks like we removed a couple of find_stack_levels on main that are still present on 1.5.x

@MarcoGorelli
Copy link
Member Author

@phofl good to merge? I've been through the diff and it looks fine to me, doesn't look like anything unexpected has crept in when resolving conflicts

@phofl phofl merged commit 072402b into pandas-dev:1.5.x Oct 14, 2022
@phofl
Copy link
Member

phofl commented Oct 14, 2022

thx @MarcoGorelli

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Warnings Warnings that appear or should be added to pandas
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants