This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new bc54a3f0c2e [SPARK-37730][PYTHON] Replace use of
MPLPlot._add_legend_handle with MPLPlot._append_legend_handles_labels
bc54a3f0c2e is described below
commit bc54a3f0c2e08893702c3929bfe7a9d543a08cdb
Author: Michał Słapek <[email protected]>
AuthorDate: Tue Dec 28 10:38:27 2021 +0900
[SPARK-37730][PYTHON] Replace use of MPLPlot._add_legend_handle with
MPLPlot._append_legend_handles_labels
### What changes were proposed in this pull request?
Replace use of MPLPlot._add_legend_handle (removed in pandas) with
MPLPlot._append_legend_handles_labels in histogram and KDE plots.
Based on:
https://github.com/pandas-dev/pandas/commit/029907c9d69a0260401b78a016a6c4515d8f1c40
### Why are the changes needed?
Fix of SPARK-37730. plot.hist and plot.kde don't throw AttributeError for
pandas=1.3.5.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
~~Tested with existing plot test on CI (for older pandas only).~~ (it seems
that CI doesn't run matplotlib tests, see
https://github.com/apache/spark/pull/35000#issuecomment-1001267197)
I've run tests on a local computer, see
https://github.com/apache/spark/pull/35000#issuecomment-1001494019 :
```
$ python python/pyspark/pandas/tests/plot/test_series_plot_matplotlib.py
```
:question: **QUESTION:** Maybe add plot testing for pandas 1.3.5 on CI?
(I've noticed that CI uses `pandas=1.3.4`, maybe update it to `1.3.5`?)
Closes #35000 from mslapek/fixpythonplot.
Authored-by: Michał Słapek <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
(cherry picked from commit 371e307686debc4f7b44a37d2345a1a512f3fdcc)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
python/pyspark/pandas/plot/matplotlib.py | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/python/pyspark/pandas/plot/matplotlib.py
b/python/pyspark/pandas/plot/matplotlib.py
index 91387805c42..030623605e5 100644
--- a/python/pyspark/pandas/plot/matplotlib.py
+++ b/python/pyspark/pandas/plot/matplotlib.py
@@ -392,6 +392,12 @@ class PandasOnSparkHistPlot(PandasHistPlot,
HistogramPlotBase):
kwds = self.kwds.copy()
label = pprint_thing(label if len(label) > 1 else label[0])
+ # `if hasattr(...)` makes plotting compatible with pandas < 1.3,
see pandas-dev/pandas#40078.
+ label = (
+ self._mark_right_label(label, index=i)
+ if hasattr(self, "_mark_right_label")
+ else label
+ )
kwds["label"] = label
style, kwds = self._apply_style_colors(colors, kwds, i, label)
@@ -400,7 +406,10 @@ class PandasOnSparkHistPlot(PandasHistPlot,
HistogramPlotBase):
kwds = self._make_plot_keywords(kwds, y)
artists = self._plot(ax, y, column_num=i, stacking_id=stacking_id,
**kwds)
- self._add_legend_handle(artists[0], label, index=i)
+ # `if hasattr(...)` makes plotting compatible with pandas < 1.3,
see pandas-dev/pandas#40078.
+ self._append_legend_handles_labels(artists[0], label) if hasattr(
+ self, "_append_legend_handles_labels"
+ ) else self._add_legend_handle(artists[0], label, index=i)
@classmethod
def _plot(cls, ax, y, style=None, bins=None, bottom=0, column_num=0,
stacking_id=None, **kwds):
@@ -483,6 +492,12 @@ class PandasOnSparkKdePlot(PandasKdePlot, KdePlotBase):
kwds = self.kwds.copy()
label = pprint_thing(label if len(label) > 1 else label[0])
+ # `if hasattr(...)` makes plotting compatible with pandas < 1.3,
see pandas-dev/pandas#40078.
+ label = (
+ self._mark_right_label(label, index=i)
+ if hasattr(self, "_mark_right_label")
+ else label
+ )
kwds["label"] = label
style, kwds = self._apply_style_colors(colors, kwds, i, label)
@@ -491,7 +506,10 @@ class PandasOnSparkKdePlot(PandasKdePlot, KdePlotBase):
kwds = self._make_plot_keywords(kwds, y)
artists = self._plot(ax, y, column_num=i, stacking_id=stacking_id,
**kwds)
- self._add_legend_handle(artists[0], label, index=i)
+ # `if hasattr(...)` makes plotting compatible with pandas < 1.3,
see pandas-dev/pandas#40078.
+ self._append_legend_handles_labels(artists[0], label) if hasattr(
+ self, "_append_legend_handles_labels"
+ ) else self._add_legend_handle(artists[0], label, index=i)
def _get_ind(self, y):
return KdePlotBase.get_ind(y, self.ind)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
