Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit a7ccc536 authored by Matthieu Tristram's avatar Matthieu Tristram
Browse files

Update color_cycle for matplotlib >= 1.5

parent c77931ed
......@@ -1632,7 +1632,6 @@ class prof:
all plot arguments
"""
ax = plt.gca()
<<<<<<< HEAD
from matplotlib import __version__
if __version__ >= '1.5':
colordef = next(ax._get_lines.prop_cycler)
......@@ -1640,10 +1639,6 @@ class prof:
colordef = next(ax._get_lines.color_cycle)
color = kwargs.pop( "color", colordef)
=======
color = kwargs.pop( "color", next(ax._get_lines.color_cycle))
>>>>>>> 6b166d29334f58c14911e7fc538209c24df7cc54
linestyle = kwargs.pop( "linestyle", '-')
label = kwargs.pop( "label", None)
marker = kwargs.pop( "marker", 'o')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment