Skip to content

Don't use pandas 0.25.0 for testing - #14861

Merged
dstansby merged 2 commits into
matplotlib:masterfrom
dstansby:pandas-badversion
Jul 21, 2019
Merged

dstansby merged 2 commits into
matplotlib:masterfrom
dstansby:pandas-badversion

Conversation

@dstansby

Copy link
Copy Markdown
Member

Thanks @bingyao for putting in a quick fix here: #14860; I think blacklisting pandas 0.25.0 is the correct long term thing to do however, as a fix (pandas-dev/pandas#27481) should hopefully go into 0.25.1

@dstansby dstansby added this to the v3.2.0 milestone Jul 19, 2019
@jklymak

jklymak commented Jul 20, 2019

Copy link
Copy Markdown
Member

Yeah if we think we can fix in pandas.

@timhoffm

Copy link
Copy Markdown
Member

appveyor still fails test_bar_pandas with

TypeError: the dtypes of parameters x (datetime64[ns]) and width (int32) are incompatible

@dstansby
dstansby force-pushed the pandas-badversion branch from c9b2aa6 to 5ad791e Compare July 20, 2019 17:22
@dstansby
dstansby merged commit e5b4f79 into matplotlib:master Jul 21, 2019
@dstansby
dstansby deleted the pandas-badversion branch July 21, 2019 14:06
@dstansby dstansby modified the milestones: v3.2.0, v3.1.2 Jul 21, 2019
@dstansby

Copy link
Copy Markdown
Member Author

@meeseeksdev backport to v3.1.x

@lumberbot-app

lumberbot-app Bot commented Jul 21, 2019

Copy link
Copy Markdown

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 v3.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 e5b4f79c6a4897895ad32d5b789b43e206d7a53c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #14861: Don't use pandas 0.25.0 for testing"
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14861-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #14861 on branch v3.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.

@timhoffm

Copy link
Copy Markdown
Member

Backported in dec7c67

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants