Requested changes

Author: rhshadrach

pandas/plotting/_core.py

@@ -1,4 +1,5 @@
 import importlib
+from typing import TYPE_CHECKING, Optional, Sequence, Tuple, Union
 
 from pandas._config import get_option
 
@@ -9,20 +10,23 @@
 
 from pandas.core.base import PandasObject
 
+if TYPE_CHECKING:
+    from pandas import DataFrame
+
 
 def hist_series(
     self,
     by=None,
     ax=None,
-    grid=True,
-    xlabelsize=None,
-    xrot=None,
-    ylabelsize=None,
-    yrot=None,
-    figsize=None,
-    bins=10,
-    legend=False,
-    backend=None,
+    grid: bool = True,
+    xlabelsize: Optional[int] = None,
+    xrot: Optional[float] = None,
+    ylabelsize: Optional[int] = None,
+    yrot: Optional[float] = None,
+    figsize: Optional[Tuple[int, int]] = None,
+    bins: Union[int, Sequence[int]] = 10,
+    legend: bool = False,
+    backend: Optional[str] = None,
     **kwargs,
 ):
     """
@@ -53,6 +57,9 @@ def hist_series(
         bin. In this case, bins is returned unmodified.
     legend : bool, default False
         Whether to show the legend.
+
+        ..versionadded:: 1.1.0
+
     backend : str, default None
         Backend to use instead of the backend specified in the option
         ``plotting.backend``. For instance, 'matplotlib'. Alternatively, to
@@ -91,22 +98,22 @@ def hist_series(
 
 
 def hist_frame(
-    data,
-    column=None,
+    data: "DataFrame",
+    column: Optional[Union[str, Sequence[str]]] = None,
     by=None,
-    grid=True,
-    xlabelsize=None,
-    xrot=None,
-    ylabelsize=None,
-    yrot=None,
+    grid: bool = True,
+    xlabelsize: Optional[int] = None,
+    xrot: Optional[float] = None,
+    ylabelsize: Optional[int] = None,
+    yrot: Optional[float] = None,
     ax=None,
-    sharex=False,
-    sharey=False,
-    figsize=None,
-    layout=None,
-    bins=10,
-    legend=False,
-    backend=None,
+    sharex: bool = False,
+    sharey: bool = False,
+    figsize: Optional[Tuple[int, int]] = None,
+    layout: Optional[Tuple[int, int]] = None,
+    bins: Union[int, Sequence[int]] = 10,
+    legend: bool = False,
+    backend: Optional[str] = None,
     **kwargs,
 ):
     """
@@ -161,6 +168,9 @@ def hist_frame(
         bin. In this case, bins is returned unmodified.
     legend : bool, default False
         Whether to show the legend.
+
+        ..versionadded:: 1.1.0
+
     backend : str, default None
         Backend to use instead of the backend specified in the option
         ``plotting.backend``. For instance, 'matplotlib'. Alternatively, to

pandas/tests/plotting/test_groupby.py

@@ -8,7 +8,7 @@
 
 from pandas import DataFrame, Index, Series
 import pandas._testing as tm
-from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
+from pandas.tests.plotting.common import TestPlotBase
 
 
 @td.skip_if_no_mpl
@@ -70,6 +70,8 @@ def test_plot_kwargs(self):
     @pytest.mark.parametrize("column, expected_axes_num", [(None, 2), ("b", 1)])
     @pytest.mark.parametrize("label", [None, "d"])
     def test_groupby_hist_with_legend(self, column, expected_axes_num, label):
+        # GH 6279
+        # Histogram can have a legend
         expected_layout = (1, expected_axes_num)
         expected_labels = label or column or [["a"], ["b"]]
 
@@ -84,13 +86,19 @@ def test_groupby_hist_with_legend(self, column, expected_axes_num, label):
 
         ret = g.hist(**kwargs)
         for (_, axes) in ret.iteritems():
-            self._check_axes_shape(axes, axes_num=expected_axes_num, layout=expected_layout)
+            self._check_axes_shape(
+                axes, axes_num=expected_axes_num, layout=expected_layout
+            )
             for ax, expected_label in zip(axes[0], expected_labels):
                 self._check_legend_labels(ax, expected_label)
         tm.close()
 
-    @pytest.mark.parametrize("label, expected_label", [(None, ['1', '2']), ("d", ["d", "d"])])
+    @pytest.mark.parametrize(
+        "label, expected_label", [(None, ["1", "2"]), ("d", ["d", "d"])]
+    )
     def test_groupby_hist_series_with_legend(self, label, expected_label):
+        # GH 6279
+        # Histogram can have a legend
         index = Index(15 * [1] + 15 * [2], name="c")
         df = DataFrame(np.random.randn(30, 2), index=index, columns=["a", "b"])
         g = df.groupby("c")

pandas/tests/plotting/test_hist_method.py

@@ -129,17 +129,22 @@ def test_plot_fails_when_ax_differs_from_figure(self):
         with pytest.raises(AssertionError):
             self.ts.hist(ax=ax1, figure=fig2)
 
-    @pytest.mark.slow
-    @pytest.mark.parametrize("by, expected_axes_num, expected_layout", [(None, 1, (1, 1)), ("b", 2, (1, 2))])
+    @pytest.mark.parametrize(
+        "by, expected_axes_num, expected_layout", [(None, 1, (1, 1)), ("b", 2, (1, 2))]
+    )
     @pytest.mark.parametrize("label, expected_label", [(None, "a"), ("c", "c")])
-    def test_hist_with_legend(self, by, expected_axes_num, expected_layout, label, expected_label):
+    def test_hist_with_legend(
+        self, by, expected_axes_num, expected_layout, label, expected_label
+    ):
+        # GH 6279
+        # Histogram can have a legend
         index = 15 * [1] + 15 * [2]
         s = Series(np.random.randn(30), index=index, name="a")
         s.index.name = "b"
 
         kwargs = {"legend": True, "by": by}
+        # We get warnings if kwargs contains "label": None
         if label is not None:
-            # Behavior differs if kwargs contains "label": None
             kwargs["label"] = label
 
         axes = _check_plot_works(s.hist, **kwargs)
@@ -310,11 +315,12 @@ def test_hist_column_order_unchanged(self, column, expected):
 
         assert result == expected
 
-    @pytest.mark.slow
     @pytest.mark.parametrize("by", [None, "c"])
     @pytest.mark.parametrize("column", [None, "b"])
     @pytest.mark.parametrize("label", [None, "d"])
     def test_hist_with_legend(self, by, column, label):
+        # GH 6279
+        # Histogram can have a legend
         expected_axes_num = 1 if by is None and column is not None else 2
         expected_layout = (1, expected_axes_num)
         expected_labels = label or column or ["a", "b"]
@@ -325,8 +331,8 @@ def test_hist_with_legend(self, by, column, label):
         df = DataFrame(np.random.randn(30, 2), index=index, columns=["a", "b"])
 
         kwargs = {"legend": True, "by": by, "column": column}
+        # We get warnings if kwargs contains "label": None
         if label is not None:
-            # Behavior differs if kwargs contains "label": None
             kwargs["label"] = label
 
         axes = _check_plot_works(df.hist, **kwargs)