Merge pull request #70 from dnstanciu/master

Fixed JSON settings being overwritten with matplotlib version.
This commit is contained in:
Roger Labbe 2015-11-20 16:16:09 -08:00
commit b0f84e0c16

View File

@ -124,7 +124,7 @@ def load_style(directory = '.', name='code/custom.css'):
# matplotlib has deprecated the use of axes.color_cycle as of version
version = [int(s) for s in matplotlib.__version__.split('.')]
version = [int(version_no) for version_no in matplotlib.__version__.split('.')]
if version[0] > 1 or (version[0] == 1 and version[1] >= 5):
s["axes.prop_cycle"] = "cycler('color', ['#6d904f','#013afe', '#202020','#fc4f30','#e5ae38','#A60628','#30a2da','#008080','#7A68A6','#CF4457','#188487','#E24A33'])"
s.pop("axes.color_cycle", None)