Skip to content

Commit

Permalink
API/VIS: remove misc plotting methods from plot accessor (revert pand…
Browse files Browse the repository at this point in the history
  • Loading branch information
jorisvandenbossche authored and Pingviinituutti committed Feb 28, 2019
1 parent 631e4f5 commit 91e7d22
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 53 deletions.
1 change: 0 additions & 1 deletion doc/source/whatsnew/v0.24.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ Other Enhancements
- :meth:`MultiIndex.to_flat_index` has been added to flatten multiple levels into a single-level :class:`Index` object.
- :meth:`DataFrame.to_stata` and :class:`pandas.io.stata.StataWriter117` can write mixed sting columns to Stata strl format (:issue:`23633`)
- :meth:`DataFrame.between_time` and :meth:`DataFrame.at_time` have gained the ``axis`` parameter (:issue:`8839`)
- 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`)
- :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`)
- :class:`IntervalIndex` has gained the :attr:`~IntervalIndex.is_overlapping` attribute to indicate if the ``IntervalIndex`` contains any overlapping intervals (:issue:`23309`)
- :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`)
Expand Down
23 changes: 0 additions & 23 deletions pandas/plotting/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from pandas.core.generic import _shared_doc_kwargs, _shared_docs

from pandas.io.formats.printing import pprint_thing
from pandas.plotting import _misc as misc
from pandas.plotting._compat import _mpl_ge_3_0_0
from pandas.plotting._style import _get_standard_colors, plot_params
from pandas.plotting._tools import (
Expand Down Expand Up @@ -2908,15 +2907,6 @@ def pie(self, **kwds):
"""
return self(kind='pie', **kwds)

def lag(self, *args, **kwds):
return misc.lag_plot(self._parent, *args, **kwds)

def autocorrelation(self, *args, **kwds):
return misc.autocorrelation_plot(self._parent, *args, **kwds)

def bootstrap(self, *args, **kwds):
return misc.bootstrap_plot(self._parent, *args, **kwds)


class FramePlotMethods(BasePlotMethods):
"""DataFrame plotting accessor and method
Expand Down Expand Up @@ -3612,16 +3602,3 @@ def hexbin(self, x, y, C=None, reduce_C_function=None, gridsize=None,
if gridsize is not None:
kwds['gridsize'] = gridsize
return self(kind='hexbin', x=x, y=y, C=C, **kwds)

def scatter_matrix(self, *args, **kwds):
return misc.scatter_matrix(self._parent, *args, **kwds)

def andrews_curves(self, class_column, *args, **kwds):
return misc.andrews_curves(self._parent, class_column, *args, **kwds)

def parallel_coordinates(self, class_column, *args, **kwds):
return misc.parallel_coordinates(self._parent, class_column,
*args, **kwds)

def radviz(self, class_column, *args, **kwds):
return misc.radviz(self._parent, class_column, *args, **kwds)
16 changes: 0 additions & 16 deletions pandas/tests/plotting/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -2988,22 +2988,6 @@ def test_secondary_axis_font_size(self, method):
self._check_ticks_props(axes=ax.right_ax,
ylabelsize=fontsize)

def test_misc_bindings(self, monkeypatch):
df = pd.DataFrame(randn(10, 10), columns=list('abcdefghij'))
monkeypatch.setattr('pandas.plotting._misc.scatter_matrix',
lambda x: 2)
monkeypatch.setattr('pandas.plotting._misc.andrews_curves',
lambda x, y: 2)
monkeypatch.setattr('pandas.plotting._misc.parallel_coordinates',
lambda x, y: 2)
monkeypatch.setattr('pandas.plotting._misc.radviz',
lambda x, y: 2)

assert df.plot.scatter_matrix() == 2
assert df.plot.andrews_curves('a') == 2
assert df.plot.parallel_coordinates('a') == 2
assert df.plot.radviz('a') == 2


def _generate_4_axes_via_gridspec():
import matplotlib.pyplot as plt
Expand Down
13 changes: 0 additions & 13 deletions pandas/tests/plotting/test_series.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,19 +878,6 @@ def test_custom_business_day_freq(self):

_check_plot_works(s.plot)

def test_misc_bindings(self, monkeypatch):
s = Series(randn(10))
monkeypatch.setattr('pandas.plotting._misc.lag_plot',
lambda x: 2)
monkeypatch.setattr('pandas.plotting._misc.autocorrelation_plot',
lambda x: 2)
monkeypatch.setattr('pandas.plotting._misc.bootstrap_plot',
lambda x: 2)

assert s.plot.lag() == 2
assert s.plot.autocorrelation() == 2
assert s.plot.bootstrap() == 2

@pytest.mark.xfail
def test_plot_accessor_updates_on_inplace(self):
s = Series([1, 2, 3, 4])
Expand Down

0 comments on commit 91e7d22

Please sign in to comment.