Skip to content

Conversation

@mzeitlin11
Copy link
Member

Picking up #38594. Left in 1.3 for now since all comments were addressed except small typing issues and seems like a nice enhancement, but let me know if it should be moved.

@jreback jreback added this to the 1.3 milestone Jun 25, 2021
@jreback jreback merged commit 902be02 into pandas-dev:master Jun 25, 2021
@lumberbot-app
Copy link

lumberbot-app bot commented Jun 25, 2021

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.3.x $ git pull 
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 902be0267dfe3c2ec9263a92919ed0c2cca7ce18 
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #42168: ENH: add ignore index to DataFrame / Series.sample' 
  1. Push to a named branch :
git push YOURFORK 1.3.x:auto-backport-of-pr-42168-on-1.3.x 
  1. Create a PR against branch 1.3.x, I would have named this PR:

"Backport PR #42168 on branch 1.3.x"

And apply the correct labels and milestones.

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

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

@jreback
Copy link
Contributor

jreback commented Jun 25, 2021

thanks @mzeitlin11 and @erfannariman for the original!

@jreback
Copy link
Contributor

jreback commented Jun 25, 2021

cc @meeseeksdev backport 1.3.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 25, 2021

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.3.x $ git pull 
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 902be0267dfe3c2ec9263a92919ed0c2cca7ce18 
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #42168: ENH: add ignore index to DataFrame / Series.sample' 
  1. Push to a named branch :
git push YOURFORK 1.3.x:auto-backport-of-pr-42168-on-1.3.x 
  1. Create a PR against branch 1.3.x, I would have named this PR:

"Backport PR #42168 on branch 1.3.x"

And apply the correct labels and milestones.

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

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

@jreback
Copy link
Contributor

jreback commented Jun 25, 2021

@mzeitlin11 looks like a conflict on 1.3 if you do a manual PR (cc @simonjayhawkins)

@mzeitlin11
Copy link
Member Author

@mzeitlin11 looks like a conflict on 1.3 if you do a manual PR (cc @simonjayhawkins)

Yep I can take care of it later today

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

4 participants