Skip to content

DOC: Move whatsnew for indexing regression #47924

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

Merged
merged 4 commits into from
Aug 3, 2022

Conversation

phofl
Copy link
Member

@phofl phofl commented Aug 1, 2022

xref #47921, #47867 (comment)

Moves the whatsnew

@simonjayhawkins simonjayhawkins added this to the 1.4.4 milestone Aug 2, 2022
@simonjayhawkins
Copy link
Member

milestone 1.4.4 but does not need to be backported (@phofl note that sometimes that the release notes go out of sync and need to be corrected)

Do you think we should also add the code sample from #47867 to close that issue? (the test would also be backported so could be a separate PR)

@phofl
Copy link
Member Author

phofl commented Aug 3, 2022

Yes. would do this as a follow up

Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

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

Thanks @phofl ok to merge this once #47921 is merged. see #47921 (review)

@simonjayhawkins
Copy link
Member

@phofl i'm not sure about #47925 so have resolved the conflict, but if that gets merged we would probably have conflicts here again.

@simonjayhawkins
Copy link
Member

urgh I should have left it in otherwise we will get more conflicts if we have to move the release note for that one.

don't merge this yet. although i'm doing something else at the moment (fixing the typing on 1.4.x) so probably won't fix this till tomorrow.

@phofl
Copy link
Member Author

phofl commented Aug 3, 2022

No worries, added it back in

@simonjayhawkins
Copy link
Member

Thanks. sorry for interfering. I thought it'd be quicker to just resolve the conflicts on the web interface than ping you.

Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

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

Thanks @phofl merge when ready

@phofl
Copy link
Member Author

phofl commented Aug 3, 2022

No worries. I am doing this in Pycharm anyway, so did not create additional work for me. Thanks for helping

@phofl phofl merged commit 6e998a6 into pandas-dev:main Aug 3, 2022
@phofl phofl deleted the doc_move_whatsnew branch August 3, 2022 21:06
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 3, 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.4.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 6e998a6c7c9bb42adb529597d2a12a029f26c297
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #47924: DOC: Move whatsnew for indexing regression'
  1. Push to a named branch:
git push YOURFORK 1.4.x:auto-backport-of-pr-47924-on-1.4.x
  1. Create a PR against branch 1.4.x, I would have named this PR:

"Backport PR #47924 on branch 1.4.x (DOC: Move whatsnew for indexing regression)"

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.

@phofl
Copy link
Member Author

phofl commented Aug 3, 2022

Don't have to backport this

noatamir pushed a commit to noatamir/pandas that referenced this pull request Nov 9, 2022
* DOC: Move whatsnew for indexing regression

* Change whatsnew

* Add whatsnew back in

Co-authored-by: Simon Hawkins <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants