Skip to content

Backport PR #8690 on branch v3.1.x - #13709

Merged
QuLogic merged 1 commit into
matplotlib:v3.1.xfrom
tacaswell:auto-backport-of-pr-8690-on-v3.1.x
Mar 19, 2019
Merged

QuLogic merged 1 commit into
matplotlib:v3.1.xfrom
tacaswell:auto-backport-of-pr-8690-on-v3.1.x

Conversation

@tacaswell

@tacaswell tacaswell commented Mar 19, 2019 •

Copy link
Copy Markdown
Member

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

  • 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

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 tacaswell added this to the v3.1.0 milestone Mar 19, 2019
@QuLogic
QuLogic merged commit afc4e61 into matplotlib:v3.1.x Mar 19, 2019
@tacaswell
tacaswell deleted the auto-backport-of-pr-8690-on-v3.1.x branch March 20, 2019 18:27
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants