Skip to content

CI/TST: change skip to xfail #35660 #35672

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 2 commits into from
Aug 11, 2020

Conversation

fangchenli
Copy link
Member

Followup of #35660

@jreback jreback added the Testing pandas testing functions or related to the test suite label Aug 11, 2020
@jreback jreback added this to the 1.2 milestone Aug 11, 2020
@jreback jreback merged commit 3c87b01 into pandas-dev:master Aug 11, 2020
@jreback
Copy link
Contributor

jreback commented Aug 11, 2020

thanks @VirosaLi

@fangchenli fangchenli deleted the test_common-xfail branch August 12, 2020 02:41
@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 19, 2020

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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 3c87b019b63ebff3c56acb6402fba5bc6f99671f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #35672: CI/TST: change skip to xfail #35660'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-35672-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #35672 on branch 1.1.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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Testing pandas testing functions or related to the test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants