From 4279e562db94fa852e2cef16952c994181e14b91 Mon Sep 17 00:00:00 2001 From: endolith Date: Sat, 7 Dec 2013 16:51:18 -0500 Subject: [PATCH 1/2] Remove redundant colormaps from examples `gist_yarg`, `gist_gray`, and `binary` are identical to `gray`, so they are "on a deprecation path", and `spectral` was renamed to `nipy_spectral` to avoid conflicts with `Spectral` https://github.com/matplotlib/matplotlib/pull/889 --- examples/color/colormaps_reference.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/color/colormaps_reference.py b/examples/color/colormaps_reference.py index 1c433794e4e1..c5ec3776239c 100644 --- a/examples/color/colormaps_reference.py +++ b/examples/color/colormaps_reference.py @@ -36,17 +36,17 @@ import matplotlib.pyplot as plt -cmaps = [('Sequential', ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', +cmaps = [('Sequential', ['Blues', 'BuGn', 'BuPu', 'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']), ('Sequential (2)', ['afmhot', 'autumn', 'bone', 'cool', 'copper', - 'gist_gray', 'gist_heat', 'gray', 'hot', 'pink', + 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter']), ('Diverging', ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'seismic']), ('Qualitative', ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', - 'Pastel2', 'Set1', 'Set2', 'Set3', 'spectral']), + 'Pastel2', 'Set1', 'Set2', 'Set3', 'nipy_spectral']), ('Miscellaneous', ['gist_earth', 'gist_ncar', 'gist_rainbow', 'gist_stern', 'jet', 'brg', 'CMRmap', 'cubehelix', 'gnuplot', 'gnuplot2', 'ocean', 'rainbow', From 38690652137356b62e453fa82215f1cde8792890 Mon Sep 17 00:00:00 2001 From: endolith Date: Sat, 7 Dec 2013 17:05:40 -0500 Subject: [PATCH 2/2] DOC: Move spectral colormaps together `Spectral` was missing, and `hsv` and `nipy_spectral` shouldn't be in the qualitative group, which are the 8 colormaps dumped here from ColorBrewer but that shouldn't really be here --- examples/color/colormaps_reference.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/color/colormaps_reference.py b/examples/color/colormaps_reference.py index c5ec3776239c..111201a7970b 100644 --- a/examples/color/colormaps_reference.py +++ b/examples/color/colormaps_reference.py @@ -44,13 +44,15 @@ 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter']), ('Diverging', ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', - 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'seismic']), - ('Qualitative', ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', - 'Pastel2', 'Set1', 'Set2', 'Set3', 'nipy_spectral']), - ('Miscellaneous', ['gist_earth', 'gist_ncar', 'gist_rainbow', - 'gist_stern', 'jet', 'brg', 'CMRmap', 'cubehelix', - 'gnuplot', 'gnuplot2', 'ocean', 'rainbow', - 'terrain', 'flag', 'prism'])] + 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'Spectral', + 'seismic']), + ('Qualitative', ['Accent', 'Dark2', 'Paired', 'Pastel1', + 'Pastel2', 'Set1', 'Set2', 'Set3']), + ('Miscellaneous', ['gist_earth', 'terrain', 'ocean', 'gist_stern', + 'brg', 'CMRmap', 'cubehelix', + 'gnuplot', 'gnuplot2', 'gist_ncar', + 'nipy_spectral', 'jet', 'rainbow', + 'gist_rainbow', 'hsv', 'flag', 'prism'])] nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps)