-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
CLN: clean color selection in _matplotlib/style #37203
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
Changes from 23 commits
0f1b99a
901453a
201b25f
8e13df5
37a820d
3883a13
f93743c
b4c3267
6af1543
31125f7
45647a4
393ae46
fe66213
1626108
79b0f08
f513bdb
76f7663
0f0f4bc
b8daf79
37734e8
765836f
4479e37
dd9efd7
f0ea701
dedd0dd
b369834
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,14 @@ | ||
# being a bit too dynamic | ||
from typing import ( | ||
TYPE_CHECKING, | ||
Collection, | ||
Dict, | ||
Iterator, | ||
List, | ||
Optional, | ||
Sequence, | ||
Union, | ||
cast, | ||
) | ||
import warnings | ||
|
||
import matplotlib.cm as cm | ||
|
@@ -9,74 +19,156 @@ | |
|
||
import pandas.core.common as com | ||
|
||
if TYPE_CHECKING: | ||
from matplotlib.colors import Colormap | ||
|
||
|
||
Color = Union[str, Sequence[float]] | ||
|
||
|
||
def get_standard_colors( | ||
num_colors: int, colormap=None, color_type: str = "default", color=None | ||
num_colors: int, | ||
colormap: Optional["Colormap"] = None, | ||
color_type: str = "default", | ||
color: Optional[Union[Dict[str, Color], Color, Collection[Color]]] = None, | ||
): | ||
import matplotlib.pyplot as plt | ||
|
||
if isinstance(color, dict): | ||
return color | ||
|
||
colors = _get_colors( | ||
color=color, | ||
colormap=colormap, | ||
color_type=color_type, | ||
num_colors=num_colors, | ||
) | ||
|
||
return _cycle_colors(colors, num_colors=num_colors) | ||
|
||
|
||
def _get_colors( | ||
*, | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
color: Optional[Union[Color, Collection[Color]]], | ||
colormap: Optional[Union[str, "Colormap"]], | ||
color_type: str, | ||
num_colors: int, | ||
) -> List[Color]: | ||
"""Get colors from user input.""" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you add a doc-string. also the current summary is not very descriptive, nor is the function name . There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I changed it into |
||
if color is None and colormap is not None: | ||
if isinstance(colormap, str): | ||
cmap = colormap | ||
colormap = cm.get_cmap(colormap) | ||
if colormap is None: | ||
raise ValueError(f"Colormap {cmap} is not recognized") | ||
colors = [colormap(num) for num in np.linspace(0, 1, num=num_colors)] | ||
return _get_colors_from_colormap(colormap, num_colors=num_colors) | ||
elif color is not None: | ||
if colormap is not None: | ||
warnings.warn( | ||
"'color' and 'colormap' cannot be used simultaneously. Using 'color'" | ||
) | ||
colors = ( | ||
list(color) | ||
if is_list_like(color) and not isinstance(color, dict) | ||
else color | ||
) | ||
return _get_colors_from_color(color) | ||
else: | ||
if color_type == "default": | ||
# need to call list() on the result to copy so we don't | ||
# modify the global rcParams below | ||
try: | ||
colors = [c["color"] for c in list(plt.rcParams["axes.prop_cycle"])] | ||
except KeyError: | ||
colors = list(plt.rcParams.get("axes.color_cycle", list("bgrcmyk"))) | ||
if isinstance(colors, str): | ||
colors = list(colors) | ||
|
||
colors = colors[0:num_colors] | ||
elif color_type == "random": | ||
|
||
def random_color(column): | ||
""" Returns a random color represented as a list of length 3""" | ||
# GH17525 use common._random_state to avoid resetting the seed | ||
rs = com.random_state(column) | ||
return rs.rand(3).tolist() | ||
|
||
colors = [random_color(num) for num in range(num_colors)] | ||
else: | ||
raise ValueError("color_type must be either 'default' or 'random'") | ||
return _get_colors_from_color_type(color_type, num_colors=num_colors) | ||
|
||
if isinstance(colors, str) and _is_single_color(colors): | ||
# GH #36972 | ||
colors = [colors] | ||
|
||
# Append more colors by cycling if there is not enough color. | ||
# Extra colors will be ignored by matplotlib if there are more colors | ||
# than needed and nothing needs to be done here. | ||
def _cycle_colors(colors: List[Color], num_colors: int) -> List[Color]: | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"""Append more colors by cycling if there is not enough color. | ||
|
||
Extra colors will be ignored by matplotlib if there are more colors | ||
than needed and nothing needs to be done here. | ||
""" | ||
if len(colors) < num_colors: | ||
try: | ||
multiple = num_colors // len(colors) - 1 | ||
except ZeroDivisionError: | ||
raise ValueError("Invalid color argument: ''") | ||
multiple = num_colors // len(colors) - 1 | ||
mod = num_colors % len(colors) | ||
|
||
colors += multiple * colors | ||
colors += colors[:mod] | ||
|
||
return colors | ||
|
||
|
||
def _is_single_color(color: str) -> bool: | ||
def _get_colors_from_colormap( | ||
colormap: Union[str, "Colormap"], | ||
num_colors: int, | ||
) -> List[Color]: | ||
"""Get colors from colormap.""" | ||
colormap = _get_cmap_instance(colormap) | ||
return [colormap(num) for num in np.linspace(0, 1, num=num_colors)] | ||
|
||
|
||
def _get_cmap_instance(colormap: Union[str, "Colormap"]) -> "Colormap": | ||
"""Get instance of matplotlib colormap.""" | ||
if isinstance(colormap, str): | ||
cmap = colormap | ||
colormap = cm.get_cmap(colormap) | ||
if colormap is None: | ||
raise ValueError(f"Colormap {cmap} is not recognized") | ||
return colormap | ||
|
||
|
||
def _get_colors_from_color( | ||
color: Union[Color, Collection[Color]], | ||
) -> List[Color]: | ||
"""Get colors from user input color.""" | ||
if len(color) == 0: | ||
raise ValueError(f"Invalid color argument: {color}") | ||
|
||
if isinstance(color, str) and _is_single_color(color): | ||
# GH #36972 | ||
return [color] | ||
|
||
if _is_floats_color(color): | ||
color = cast(Sequence[float], color) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This cast seems unnecessary - is there an error this solves? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, cast is necessary. mypy error if removing cast.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Functions can't narrow types yet in mypy, but regardless this is pretty confusing. Can you try to refactor this to make things clearer? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do not know how to make it even clearer.
Is the logic confusing or the two cast statements are? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @WillAyd, I updated the logic a little bit.
Casting is still there as there are no other options to make mypy happy. Please let me know what you think about this implementation. |
||
return [color] | ||
|
||
color = cast(Collection[Color], color) | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return list(_gen_list_of_colors_from_iterable(color)) | ||
|
||
|
||
def _gen_list_of_colors_from_iterable(color: Collection[Color]) -> Iterator[Color]: | ||
""" | ||
Yield colors from string of several letters or from collection of colors. | ||
""" | ||
for x in color: | ||
if _is_single_color(x): | ||
yield x | ||
else: | ||
raise ValueError(f"Invalid color {x}") | ||
|
||
|
||
def _is_floats_color(color: Union[Color, Collection[Color]]) -> bool: | ||
"""Check if color comprises a sequence of floats representing color.""" | ||
return bool( | ||
is_list_like(color) | ||
and (len(color) == 3 or len(color) == 4) | ||
and all(isinstance(x, float) for x in color) | ||
) | ||
|
||
|
||
def _get_colors_from_color_type(color_type: str, num_colors: int) -> List[Color]: | ||
"""Get colors from user input color type.""" | ||
if color_type == "default": | ||
return _get_default_colors(num_colors) | ||
elif color_type == "random": | ||
return _get_random_colors(num_colors) | ||
else: | ||
raise ValueError("color_type must be either 'default' or 'random'") | ||
|
||
|
||
def _get_default_colors(num_colors: int) -> List[Color]: | ||
"""Get ``num_colors`` of default colors from matplotlib rc params.""" | ||
import matplotlib.pyplot as plt | ||
|
||
colors = [c["color"] for c in plt.rcParams["axes.prop_cycle"]] | ||
return colors[0:num_colors] | ||
|
||
|
||
def _get_random_colors(num_colors: int) -> List[Color]: | ||
"""Get ``num_colors`` of random colors.""" | ||
return [_random_color(num) for num in range(num_colors)] | ||
|
||
|
||
def _random_color(column: int) -> List[float]: | ||
"""Get a random color represented as a list of length 3""" | ||
# GH17525 use common._random_state to avoid resetting the seed | ||
rs = com.random_state(column) | ||
return rs.rand(3).tolist() | ||
|
||
|
||
def _is_single_color(color: Color) -> bool: | ||
"""Check if ``color`` is a single color. | ||
|
||
Examples of single colors: | ||
|
@@ -85,11 +177,12 @@ def _is_single_color(color: str) -> bool: | |
- 'red' | ||
- 'green' | ||
- 'C3' | ||
- 'firebrick' | ||
|
||
Parameters | ||
---------- | ||
color : string | ||
Color string. | ||
color : Color | ||
Color string or sequence of floats. | ||
|
||
Returns | ||
------- | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
from contextlib import suppress | ||
|
||
import pytest | ||
|
||
import pandas.util._test_decorators as td | ||
|
||
from pandas import Series | ||
|
||
with suppress(ImportError): | ||
from pandas.plotting._matplotlib.style import get_standard_colors | ||
|
||
|
||
@td.skip_if_no_mpl | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you could just use pytest.importorskip see pandas\tests\plotting\test_converter.py or other test modules testing optional dependencies. e.g. pytables There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Did that. Please check if this is what you suggested. |
||
class TestGetStandardColors: | ||
@pytest.mark.parametrize( | ||
"num_colors, expected", | ||
[ | ||
(3, ["red", "green", "blue"]), | ||
(5, ["red", "green", "blue", "red", "green"]), | ||
(7, ["red", "green", "blue", "red", "green", "blue", "red"]), | ||
(2, ["red", "green"]), | ||
(1, ["red"]), | ||
], | ||
) | ||
def test_default_colors_named_from_prop_cycle(self, num_colors, expected): | ||
import matplotlib as mpl | ||
from matplotlib.pyplot import cycler | ||
|
||
mpl_params = { | ||
"axes.prop_cycle": cycler(color=["red", "green", "blue"]), | ||
} | ||
with mpl.rc_context(rc=mpl_params): | ||
result = get_standard_colors(num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"num_colors, expected", | ||
[ | ||
(1, ["b"]), | ||
(3, ["b", "g", "r"]), | ||
(4, ["b", "g", "r", "y"]), | ||
(5, ["b", "g", "r", "y", "b"]), | ||
(7, ["b", "g", "r", "y", "b", "g", "r"]), | ||
], | ||
) | ||
def test_default_colors_named_from_prop_cycle_string(self, num_colors, expected): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think you could combine this one with the test above, and add |
||
import matplotlib as mpl | ||
from matplotlib.pyplot import cycler | ||
|
||
mpl_params = { | ||
"axes.prop_cycle": cycler(color="bgry"), | ||
} | ||
with mpl.rc_context(rc=mpl_params): | ||
result = get_standard_colors(num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"num_colors, expected_name", | ||
[ | ||
(1, ["C0"]), | ||
(3, ["C0", "C1", "C2"]), | ||
( | ||
12, | ||
[ | ||
"C0", | ||
"C1", | ||
"C2", | ||
"C3", | ||
"C4", | ||
"C5", | ||
"C6", | ||
"C7", | ||
"C8", | ||
"C9", | ||
"C0", | ||
"C1", | ||
], | ||
), | ||
], | ||
) | ||
def test_default_colors_named_undefined_prop_cycle(self, num_colors, expected_name): | ||
import matplotlib as mpl | ||
import matplotlib.colors as mcolors | ||
|
||
with mpl.rc_context(rc={}): | ||
expected = [mcolors.to_hex(x) for x in expected_name] | ||
result = get_standard_colors(num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"num_colors, expected", | ||
[ | ||
(1, ["red", "green", (0.1, 0.2, 0.3)]), | ||
(2, ["red", "green", (0.1, 0.2, 0.3)]), | ||
(3, ["red", "green", (0.1, 0.2, 0.3)]), | ||
(4, ["red", "green", (0.1, 0.2, 0.3), "red"]), | ||
], | ||
) | ||
def test_user_input_color_sequence(self, num_colors, expected): | ||
color = ["red", "green", (0.1, 0.2, 0.3)] | ||
result = get_standard_colors(color=color, num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"num_colors, expected", | ||
[ | ||
(1, ["r", "g", "b", "k"]), | ||
(2, ["r", "g", "b", "k"]), | ||
(3, ["r", "g", "b", "k"]), | ||
(4, ["r", "g", "b", "k"]), | ||
(5, ["r", "g", "b", "k", "r"]), | ||
(6, ["r", "g", "b", "k", "r", "g"]), | ||
Comment on lines
+102
to
+107
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think it's nicer to just test the case where num_color </>/= color, so 3 parametrizations is enough. no need to change here though ^^ |
||
], | ||
) | ||
def test_user_input_color_string(self, num_colors, expected): | ||
color = "rgbk" | ||
result = get_standard_colors(color=color, num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"num_colors, expected", | ||
[ | ||
(1, [(0.1, 0.2, 0.3)]), | ||
(2, [(0.1, 0.2, 0.3), (0.1, 0.2, 0.3)]), | ||
(3, [(0.1, 0.2, 0.3), (0.1, 0.2, 0.3), (0.1, 0.2, 0.3)]), | ||
], | ||
) | ||
def test_user_input_color_floats(self, num_colors, expected): | ||
color = (0.1, 0.2, 0.3) | ||
result = get_standard_colors(color=color, num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize( | ||
"color, num_colors, expected", | ||
[ | ||
("Crimson", 1, ["Crimson"]), | ||
("DodgerBlue", 2, ["DodgerBlue", "DodgerBlue"]), | ||
("firebrick", 3, ["firebrick", "firebrick", "firebrick"]), | ||
], | ||
) | ||
def test_user_input_named_color_string(self, color, num_colors, expected): | ||
result = get_standard_colors(color=color, num_colors=num_colors) | ||
assert result == expected | ||
|
||
@pytest.mark.parametrize("color", ["", [], (), Series([], dtype="object")]) | ||
def test_empty_color_raises(self, color): | ||
with pytest.raises(ValueError, match="Invalid color argument"): | ||
get_standard_colors(color=color, num_colors=1) | ||
|
||
@pytest.mark.parametrize( | ||
"color", | ||
[ | ||
"bad_color", | ||
("red", "green", "bad_color"), | ||
(0.1,), | ||
(0.1, 0.2), | ||
(0.1, 0.2, 0.3, 0.4, 0.5), # must be either 3 or 4 floats | ||
], | ||
) | ||
def test_bad_color_raises(self, color): | ||
with pytest.raises(ValueError, match="Invalid color"): | ||
get_standard_colors(color=color, num_colors=5) |
Uh oh!
There was an error while loading. Please reload this page.