Backport PR #8690 on branch v3.1.x #13709
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds support for rgba and rgb images to pcolorfast
Conflicts:
lib/matplotlib/axes/_axes.py
- C.shape -> np.shape(C) bug fix was not backported
tacaswell
added a commit
to tacaswell/matplotlib
that referenced
this pull request
May 18, 2019
Resolved all conflicts in favor of the master branch except for the changes to doc/api/prev_api_changes/api_changes_3.1.0.rst pcolorfast was updating to take RGB(A) in some cases in PR matplotlib#8690 / 94b0bca that was backported to v3.1.x via matplotlib#13709 / afc4e61 . However, the functionality was further extended in matplotlib#13986 / c05537d which was not backported. When merging v3.1.x into master special care had to be taken to not pull the removed code back into master.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for rgba and rgb images to pcolorfast
Conflicts:
lib/matplotlib/axes/_axes.py
- C.shape -> np.shape(C) bug fix was not backported
PR Summary
#8690
PR Checklist