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

Support masked array inputs for to_rgba and to_rgba_array. #14313

Merged
merged 2 commits into from May 25, 2019

Conversation

efiring
Copy link
Member

@efiring efiring commented May 24, 2019

PR Summary

Closes #14301.

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@efiring
Copy link
Member Author

efiring commented May 24, 2019

The Travis failure is an unrelated glitch in the 3.7 build: a failure to add a ppa for ffmpeg.

@efiring efiring requested a review from dstansby May 24, 2019 20:39
@dstansby dstansby added this to the v3.1.1 milestone May 25, 2019
@dstansby dstansby merged commit 4a0d9c5 into matplotlib:master May 25, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented May 25, 2019

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 4a0d9c51a3794e99ab802b6fcbab591dffa1f440
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14313: Support masked array inputs for to_rgba and to_rgba_array.'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14313-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #14313 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.

dstansby added a commit to dstansby/matplotlib that referenced this pull request May 25, 2019
Support masked array inputs for to_rgba and to_rgba_array.
dstansby added a commit that referenced this pull request May 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

scatter() fails on nan-containing input when providing edgecolor
3 participants