Updated styles and templates for prop_cycle

WeatherGod · WeatherGod · commit 2e7b6a5132f0 · 2015-08-15T18:17:14.000-04:00
diff --git a/lib/matplotlib/mpl-data/stylelib/bmh.mplstyle b/lib/matplotlib/mpl-data/stylelib/bmh.mplstyle
@@ -17,7 +17,7 @@ axes.edgecolor: bcbcbc
 axes.grid : True
 axes.titlesize: x-large
 axes.labelsize: large
-axes.color_cycle: 348ABD, A60628, 7A68A6, 467821, D55E00, CC79A7, 56B4E9, 009E73, F0E442, 0072B2
+axes.prop_cycle: cycler('color', ['348ABD', 'A60628', '7A68A6', '467821', 'D55E00', 'CC79A7', '56B4E9', '009E73', 'F0E442', '0072B2'])
 
 legend.fancybox: True
 
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -6,7 +6,7 @@
 # information on line properties.
 lines.linewidth   : 1.0     # line width in points
 lines.linestyle   : -       # solid line
-lines.color       : b       # has no affect on plot(); see axes.color_cycle
+lines.color       : b       # has no affect on plot(); see axes.prop_cycle
 lines.marker      : None    # the default marker
 lines.markeredgewidth  : 0.5     # the line width around the marker symbol
 lines.markersize  : 6            # markersize, in points
@@ -198,7 +198,8 @@ axes.formatter.useoffset      : True    # If True, the tick label formatter
 axes.unicode_minus  : True    # use unicode for the minus symbol
                               # rather than hyphen.  See
                               # http://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
-axes.color_cycle    : b, g, r, c, m, y, k  # color cycle for plot lines
+axes.prop_cycle    : cycler('color', 'bgrcmyk')
+                                           # color cycle for plot lines
                                            # as list of string colorspecs:
                                            # single letter, long name, or
                                            # web-style hex
diff --git a/lib/matplotlib/mpl-data/stylelib/dark_background.mplstyle b/lib/matplotlib/mpl-data/stylelib/dark_background.mplstyle
@@ -8,7 +8,7 @@ text.color: white
 axes.facecolor: black
 axes.edgecolor: white
 axes.labelcolor: white
-axes.color_cycle: 8dd3c7, feffb3, bfbbd9, fa8174, 81b1d2, fdb462, b3de69, bc82bd, ccebc4, ffed6f
+axes.prop_cycle: cycler('color', ['8dd3c7', 'feffb3', 'bfbbd9', 'fa8174', '81b1d2', 'fdb462', 'b3de69', 'bc82bd', 'ccebc4', 'ffed6f'])
 
 xtick.color: white
 ytick.color: white
diff --git a/lib/matplotlib/mpl-data/stylelib/fivethirtyeight.mplstyle b/lib/matplotlib/mpl-data/stylelib/fivethirtyeight.mplstyle
@@ -6,7 +6,7 @@ lines.solid_capstyle: butt
 
 legend.fancybox: true
 
-axes.color_cycle: 30a2da, fc4f30, e5ae38, 6d904f, 8b8b8b
+axes.prop_cycle: cycler('color', ['30a2da', 'fc4f30', 'e5ae38', '6d904f', '8b8b8b'])
 axes.facecolor: f0f0f0
 axes.labelsize: large
 axes.axisbelow: true
diff --git a/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle b/lib/matplotlib/mpl-data/stylelib/ggplot.mplstyle
@@ -16,7 +16,7 @@ axes.labelsize: large
 axes.labelcolor: 555555
 axes.axisbelow: True       # grid/ticks are below elements (e.g., lines, text)
 
-axes.color_cycle: E24A33, 348ABD, 988ED5, 777777, FBC15E, 8EBA42, FFB5B8
+axes.prop_cycle: cycler('color', ['E24A33', '348ABD', '988ED5', '777777', 'FBC15E', '8EBA42', 'FFB5B8'])
                    # E24A33 : red
                    # 348ABD : blue
                    # 988ED5 : purple
diff --git a/lib/matplotlib/mpl-data/stylelib/grayscale.mplstyle b/lib/matplotlib/mpl-data/stylelib/grayscale.mplstyle
@@ -12,7 +12,7 @@ axes.facecolor: white
 axes.edgecolor: black
 axes.labelcolor: black
 # black to light gray
-axes.color_cycle: 0.00, 0.40, 0.60, 0.70
+axes.prop_cycle: cycler('color', ['0.00', '0.40', '0.60', '0.70'])
 
 xtick.color: black
 ytick.color: black
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-bright.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-bright.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn bright palette
-axes.color_cycle: 003FFF, 03ED3A, E8000B, 8A2BE2, FFC400, 00D7FF
+axes.prop_cycle: cycler('color', ['003FFF', '03ED3A', 'E8000B', '8A2BE2', 'FFC400', '00D7FF'])
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-colorblind.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-colorblind.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn colorblind palette
-axes.color_cycle: 0072B2, 009E73, D55E00, CC79A7, F0E442, 56B4E9
+axes.prop_cycle: cycler('color', ['0072B2', '009E73', 'D55E00', 'CC79A7', 'F0E442', '56B4E9'])
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-dark-palette.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-dark-palette.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn dark palette
-axes.color_cycle: 001C7F, 017517, 8C0900, 7600A1, B8860B, 006374
+axes.prop_cycle: cycler('color', ['001C7F', '017517', '8C0900', '7600A1', 'B8860B', '006374'])
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-deep.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-deep.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn deep palette
-axes.color_cycle: 4C72B0, 55A868, C44E52, 8172B2, CCB974, 64B5CD
+axes.prop_cycle: cycler('color', ['4C72B0', '55A868', 'C44E52', '8172B2', 'CCB974', '64B5CD'])
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-muted.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-muted.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn muted palette
-axes.color_cycle: 4878CF, 6ACC65, D65F5F, B47CC7, C4AD66, 77BEDB
+axes.prop_cycle: cycler('color', ['4878CF', '6ACC65', 'D65F5F', 'B47CC7', 'C4AD66', '77BEDB'])
diff --git a/lib/matplotlib/mpl-data/stylelib/seaborn-pastel.mplstyle b/lib/matplotlib/mpl-data/stylelib/seaborn-pastel.mplstyle
@@ -1,2 +1,2 @@
 # Seaborn pastel palette
-axes.color_cycle: 92C6FF, 97F0AA, FF9F9A, D0BBFF, FFFEA3, B0E0E6
+axes.prop_cycle: cycler('color', ['92C6FF', '97F0AA', 'FF9F9A', 'D0BBFF', 'FFFEA3', 'B0E0E6'])
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -80,7 +80,7 @@ backend      : %(backend)s
 # information on line properties.
 #lines.linewidth   : 1.0     # line width in points
 #lines.linestyle   : -       # solid line
-#lines.color       : blue    # has no affect on plot(); see axes.color_cycle
+#lines.color       : blue    # has no affect on plot(); see axes.prop_cycle
 #lines.marker      : None    # the default marker
 #lines.markeredgewidth  : 0.5     # the line width around the marker symbol
 #lines.markersize  : 6            # markersize, in points
@@ -267,7 +267,8 @@ backend      : %(backend)s
 #axes.unicode_minus  : True    # use unicode for the minus symbol
                                # rather than hyphen.  See
                                # http://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
-#axes.color_cycle    : b, g, r, c, m, y, k  # color cycle for plot lines
+#axes.prop_cycle    : cycler('color', 'bgrcmyk')
+                                            # color cycle for plot lines
                                             # as list of string colorspecs:
                                             # single letter, long name, or
                                             # web-style hex

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Seaborn bright palette`
`2`		`-axes.color_cycle: 003FFF, 03ED3A, E8000B, 8A2BE2, FFC400, 00D7FF`
	`2`	`+axes.prop_cycle: cycler('color', ['003FFF', '03ED3A', 'E8000B', '8A2BE2', 'FFC400', '00D7FF'])`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Seaborn colorblind palette`
`2`		`-axes.color_cycle: 0072B2, 009E73, D55E00, CC79A7, F0E442, 56B4E9`
	`2`	`+axes.prop_cycle: cycler('color', ['0072B2', '009E73', 'D55E00', 'CC79A7', 'F0E442', '56B4E9'])`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Seaborn dark palette`
`2`		`-axes.color_cycle: 001C7F, 017517, 8C0900, 7600A1, B8860B, 006374`
	`2`	`+axes.prop_cycle: cycler('color', ['001C7F', '017517', '8C0900', '7600A1', 'B8860B', '006374'])`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Seaborn deep palette`
`2`		`-axes.color_cycle: 4C72B0, 55A868, C44E52, 8172B2, CCB974, 64B5CD`
	`2`	`+axes.prop_cycle: cycler('color', ['4C72B0', '55A868', 'C44E52', '8172B2', 'CCB974', '64B5CD'])`