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

TST: troubleshoot npdev build #31594

Merged
merged 4 commits into from
Feb 3, 2020
Merged

TST: troubleshoot npdev build #31594

merged 4 commits into from
Feb 3, 2020

Conversation

jbrockmendel
Copy link
Member

No description provided.

@jbrockmendel
Copy link
Member Author

gentle ping @jreback this fixes the CI

@jreback jreback added CI Continuous Integration Testing pandas testing functions or related to the test suite labels Feb 3, 2020
@jreback jreback added this to the 1.1 milestone Feb 3, 2020
@jreback
Copy link
Contributor

jreback commented Feb 3, 2020

you have an included profile file :(

remove

ping when pushed can just merge

@jreback jreback merged commit 27f365d into pandas-dev:master Feb 3, 2020
@jreback
Copy link
Contributor

jreback commented Feb 3, 2020

thanks!

# "Cannot interpret 'foo' as a data type"
msg = "|".join(
["data type not understood", "Cannot interpret '.*' as a data type"]
)
Copy link
Member

Choose a reason for hiding this comment

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

I think we simply shouldn't test the message here, we are literally testing numpy here

@jorisvandenbossche
Copy link
Member

Remember that in general, CI fixes should be backported

@jorisvandenbossche
Copy link
Member

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Feb 3, 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.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 27f365d4d46880613ce1f125090f09e1be69a36a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #31594: TST: troubleshoot npdev build'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-31594-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #31594 on branch 1.0.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.

jorisvandenbossche pushed a commit to jorisvandenbossche/pandas that referenced this pull request Feb 3, 2020
TomAugspurger pushed a commit that referenced this pull request Feb 3, 2020
* TST: troubleshoot npdev build (#31594)

* fixup

Co-authored-by: jbrockmendel <jbrockmendel@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration 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