Skip to content

DOC: link palettable #12084

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

Merged
merged 1 commit into from
Sep 12, 2018
Merged

Conversation

jklymak
Copy link
Member

@jklymak jklymak commented Sep 10, 2018

PR Summary

Link https://jiffyclub.github.io/palettable/ as a place for "more" colormaps....

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

@jklymak jklymak added this to the v3.1 milestone Sep 10, 2018
# principles apply for this question as they do for presenting one's information
# perceptually; that is, if a colormap is chosen that is monotonically increasing
# in :math:`L^*` values, it will print in a reasonable manner to grayscale.
# Conversion to grayscale is done in many different ways [bw]_. Some of the
Copy link
Member Author

Choose a reason for hiding this comment

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

No textual changes belwo, just changed the line length < 80.

@jklymak jklymak force-pushed the doc-link-palettable branch from 22017fa to 5d4de7d Compare September 10, 2018 21:44
@tacaswell tacaswell modified the milestones: v3.1, v3.0 Sep 11, 2018
@tacaswell tacaswell merged commit 0688e12 into matplotlib:master Sep 12, 2018
@lumberbot-app
Copy link

lumberbot-app bot commented Sep 12, 2018

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.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 0688e127e7fc8f64ef4d4c8f6befa32e17d09455
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12084: DOC: link palettable'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-12084-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

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

tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Nov 9, 2018
DOC: link palettable

Conflicts:
	tutorials/colors/colormap-manipulation.py
         - file does not exist on this branch
@tacaswell tacaswell mentioned this pull request Nov 9, 2018
tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Nov 10, 2018
tacaswell added a commit that referenced this pull request Nov 10, 2018
DOC: Backport colormap documentation

Includes  #11905, #11799, #11881, and #12084
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.

2 participants