Skip to content

Commit f971b11

Browse files
API/VIS: remove misc plotting methods from plot accessor (revert #23811) (#24912)
1 parent 539c54f commit f971b11

File tree

4 files changed

+0
-53
lines changed

4 files changed

+0
-53
lines changed

doc/source/whatsnew/v0.24.0.rst

-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ Other Enhancements
429429
- :meth:`MultiIndex.to_flat_index` has been added to flatten multiple levels into a single-level :class:`Index` object.
430430
- :meth:`DataFrame.to_stata` and :class:`pandas.io.stata.StataWriter117` can write mixed sting columns to Stata strl format (:issue:`23633`)
431431
- :meth:`DataFrame.between_time` and :meth:`DataFrame.at_time` have gained the ``axis`` parameter (:issue:`8839`)
432-
- The ``scatter_matrix``, ``andrews_curves``, ``parallel_coordinates``, ``lag_plot``, ``autocorrelation_plot``, ``bootstrap_plot``, and ``radviz`` plots from the ``pandas.plotting`` module are now accessible from calling :meth:`DataFrame.plot` (:issue:`11978`)
433432
- :meth:`DataFrame.to_records` now accepts ``index_dtypes`` and ``column_dtypes`` parameters to allow different data types in stored column and index records (:issue:`18146`)
434433
- :class:`IntervalIndex` has gained the :attr:`~IntervalIndex.is_overlapping` attribute to indicate if the ``IntervalIndex`` contains any overlapping intervals (:issue:`23309`)
435434
- :func:`pandas.DataFrame.to_sql` has gained the ``method`` argument to control SQL insertion clause. See the :ref:`insertion method <io.sql.method>` section in the documentation. (:issue:`8953`)

pandas/plotting/_core.py

-23
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from pandas.core.generic import _shared_doc_kwargs, _shared_docs
2727

2828
from pandas.io.formats.printing import pprint_thing
29-
from pandas.plotting import _misc as misc
3029
from pandas.plotting._compat import _mpl_ge_3_0_0
3130
from pandas.plotting._style import _get_standard_colors, plot_params
3231
from pandas.plotting._tools import (
@@ -2906,15 +2905,6 @@ def pie(self, **kwds):
29062905
"""
29072906
return self(kind='pie', **kwds)
29082907

2909-
def lag(self, *args, **kwds):
2910-
return misc.lag_plot(self._parent, *args, **kwds)
2911-
2912-
def autocorrelation(self, *args, **kwds):
2913-
return misc.autocorrelation_plot(self._parent, *args, **kwds)
2914-
2915-
def bootstrap(self, *args, **kwds):
2916-
return misc.bootstrap_plot(self._parent, *args, **kwds)
2917-
29182908

29192909
class FramePlotMethods(BasePlotMethods):
29202910
"""DataFrame plotting accessor and method
@@ -3610,16 +3600,3 @@ def hexbin(self, x, y, C=None, reduce_C_function=None, gridsize=None,
36103600
if gridsize is not None:
36113601
kwds['gridsize'] = gridsize
36123602
return self(kind='hexbin', x=x, y=y, C=C, **kwds)
3613-
3614-
def scatter_matrix(self, *args, **kwds):
3615-
return misc.scatter_matrix(self._parent, *args, **kwds)
3616-
3617-
def andrews_curves(self, class_column, *args, **kwds):
3618-
return misc.andrews_curves(self._parent, class_column, *args, **kwds)
3619-
3620-
def parallel_coordinates(self, class_column, *args, **kwds):
3621-
return misc.parallel_coordinates(self._parent, class_column,
3622-
*args, **kwds)
3623-
3624-
def radviz(self, class_column, *args, **kwds):
3625-
return misc.radviz(self._parent, class_column, *args, **kwds)

pandas/tests/plotting/test_frame.py

-16
Original file line numberDiff line numberDiff line change
@@ -2988,22 +2988,6 @@ def test_secondary_axis_font_size(self, method):
29882988
self._check_ticks_props(axes=ax.right_ax,
29892989
ylabelsize=fontsize)
29902990

2991-
def test_misc_bindings(self, monkeypatch):
2992-
df = pd.DataFrame(randn(10, 10), columns=list('abcdefghij'))
2993-
monkeypatch.setattr('pandas.plotting._misc.scatter_matrix',
2994-
lambda x: 2)
2995-
monkeypatch.setattr('pandas.plotting._misc.andrews_curves',
2996-
lambda x, y: 2)
2997-
monkeypatch.setattr('pandas.plotting._misc.parallel_coordinates',
2998-
lambda x, y: 2)
2999-
monkeypatch.setattr('pandas.plotting._misc.radviz',
3000-
lambda x, y: 2)
3001-
3002-
assert df.plot.scatter_matrix() == 2
3003-
assert df.plot.andrews_curves('a') == 2
3004-
assert df.plot.parallel_coordinates('a') == 2
3005-
assert df.plot.radviz('a') == 2
3006-
30072991

30082992
def _generate_4_axes_via_gridspec():
30092993
import matplotlib.pyplot as plt

pandas/tests/plotting/test_series.py

-13
Original file line numberDiff line numberDiff line change
@@ -878,19 +878,6 @@ def test_custom_business_day_freq(self):
878878

879879
_check_plot_works(s.plot)
880880

881-
def test_misc_bindings(self, monkeypatch):
882-
s = Series(randn(10))
883-
monkeypatch.setattr('pandas.plotting._misc.lag_plot',
884-
lambda x: 2)
885-
monkeypatch.setattr('pandas.plotting._misc.autocorrelation_plot',
886-
lambda x: 2)
887-
monkeypatch.setattr('pandas.plotting._misc.bootstrap_plot',
888-
lambda x: 2)
889-
890-
assert s.plot.lag() == 2
891-
assert s.plot.autocorrelation() == 2
892-
assert s.plot.bootstrap() == 2
893-
894881
@pytest.mark.xfail
895882
def test_plot_accessor_updates_on_inplace(self):
896883
s = Series([1, 2, 3, 4])

0 commit comments

Comments
 (0)