Skip to content

Commit 65a1246

Browse files
committed
BUG: grouped hist and scatter use old figsize default
1 parent 4afc08e commit 65a1246

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

doc/source/v0.14.1.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ Bug Fixes
175175
- Bug in ``value_counts`` where ``NaT`` did not qualify as missing (``NaN``) (:issue:`7423`)
176176

177177

178+
- Bug in grouped ``hist`` and ``scatter`` plots use old ``figsize`` default (:issue:`7394`)
178179

179180
- Bug in ``Panel.apply`` with a multi-index as an axis (:issue:`7469`)
180181

pandas/tests/test_graphics.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -609,16 +609,16 @@ def test_hist_layout_with_by(self):
609609
df = self.hist_df
610610

611611
axes = _check_plot_works(df.height.hist, by=df.gender, layout=(2, 1))
612-
self._check_axes_shape(axes, axes_num=2, layout=(2, 1), figsize=(10, 5))
612+
self._check_axes_shape(axes, axes_num=2, layout=(2, 1))
613613

614614
axes = _check_plot_works(df.height.hist, by=df.category, layout=(4, 1))
615-
self._check_axes_shape(axes, axes_num=4, layout=(4, 1), figsize=(10, 5))
615+
self._check_axes_shape(axes, axes_num=4, layout=(4, 1))
616616

617617
axes = _check_plot_works(df.height.hist, by=df.classroom, layout=(2, 2))
618-
self._check_axes_shape(axes, axes_num=3, layout=(2, 2), figsize=(10, 5))
618+
self._check_axes_shape(axes, axes_num=3, layout=(2, 2))
619619

620-
axes = _check_plot_works(df.height.hist, by=df.category, layout=(4, 2))
621-
self._check_axes_shape(axes, axes_num=4, layout=(4, 2), figsize=(10, 5))
620+
axes = _check_plot_works(df.height.hist, by=df.category, layout=(4, 2), figsize=(12, 7))
621+
self._check_axes_shape(axes, axes_num=4, layout=(4, 2), figsize=(12, 7))
622622

623623
@slow
624624
def test_hist_no_overlap(self):
@@ -2255,11 +2255,11 @@ def test_grouped_hist(self):
22552255
df = DataFrame(randn(500, 2), columns=['A', 'B'])
22562256
df['C'] = np.random.randint(0, 4, 500)
22572257
axes = plotting.grouped_hist(df.A, by=df.C)
2258-
self._check_axes_shape(axes, axes_num=4, layout=(2, 2), figsize=(10, 5))
2258+
self._check_axes_shape(axes, axes_num=4, layout=(2, 2))
22592259

22602260
tm.close()
22612261
axes = df.hist(by=df.C)
2262-
self._check_axes_shape(axes, axes_num=4, layout=(2, 2), figsize=(10, 5))
2262+
self._check_axes_shape(axes, axes_num=4, layout=(2, 2))
22632263

22642264
tm.close()
22652265
# make sure kwargs to hist are handled
@@ -2281,6 +2281,9 @@ def test_grouped_hist(self):
22812281
with tm.assertRaises(AttributeError):
22822282
plotting.grouped_hist(df.A, by=df.C, foo='bar')
22832283

2284+
with tm.assert_produces_warning(FutureWarning):
2285+
df.hist(by='C', figsize='default')
2286+
22842287
@slow
22852288
def test_grouped_box_return_type(self):
22862289
df = self.hist_df
@@ -2366,29 +2369,28 @@ def test_grouped_hist_layout(self):
23662369
layout=(1, 3))
23672370

23682371
axes = _check_plot_works(df.hist, column='height', by=df.gender, layout=(2, 1))
2369-
self._check_axes_shape(axes, axes_num=2, layout=(2, 1), figsize=(10, 5))
2372+
self._check_axes_shape(axes, axes_num=2, layout=(2, 1))
23702373

23712374
axes = _check_plot_works(df.hist, column='height', by=df.category, layout=(4, 1))
2372-
self._check_axes_shape(axes, axes_num=4, layout=(4, 1), figsize=(10, 5))
2375+
self._check_axes_shape(axes, axes_num=4, layout=(4, 1))
23732376

23742377
axes = _check_plot_works(df.hist, column='height', by=df.category,
23752378
layout=(4, 2), figsize=(12, 8))
2376-
23772379
self._check_axes_shape(axes, axes_num=4, layout=(4, 2), figsize=(12, 8))
23782380

23792381
# GH 6769
23802382
axes = _check_plot_works(df.hist, column='height', by='classroom', layout=(2, 2))
2381-
self._check_axes_shape(axes, axes_num=3, layout=(2, 2), figsize=(10, 5))
2383+
self._check_axes_shape(axes, axes_num=3, layout=(2, 2))
23822384

23832385
# without column
23842386
axes = _check_plot_works(df.hist, by='classroom')
2385-
self._check_axes_shape(axes, axes_num=3, layout=(2, 2), figsize=(10, 5))
2387+
self._check_axes_shape(axes, axes_num=3, layout=(2, 2))
23862388

23872389
axes = _check_plot_works(df.hist, by='gender', layout=(3, 5))
2388-
self._check_axes_shape(axes, axes_num=2, layout=(3, 5), figsize=(10, 5))
2390+
self._check_axes_shape(axes, axes_num=2, layout=(3, 5))
23892391

23902392
axes = _check_plot_works(df.hist, column=['height', 'weight', 'category'])
2391-
self._check_axes_shape(axes, axes_num=3, layout=(2, 2), figsize=(10, 5))
2393+
self._check_axes_shape(axes, axes_num=3, layout=(2, 2))
23922394

23932395
@slow
23942396
def test_axis_share_x(self):

pandas/tools/plotting.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2734,20 +2734,18 @@ def _grouped_plot(plotf, data, column=None, by=None, numeric_only=True,
27342734
rot=0, ax=None, **kwargs):
27352735
from pandas import DataFrame
27362736

2737-
# allow to specify mpl default with 'default'
2738-
if figsize is None or figsize == 'default':
2739-
figsize = (10, 5) # our default
2737+
if figsize == 'default':
2738+
# allowed to specify mpl default with 'default'
2739+
warnings.warn("figsize='default' is deprecated. Specify figure"
2740+
"size by tuple instead", FutureWarning)
2741+
figsize = None
27402742

27412743
grouped = data.groupby(by)
27422744
if column is not None:
27432745
grouped = grouped[column]
27442746

27452747
naxes = len(grouped)
27462748
nrows, ncols = _get_layout(naxes, layout=layout)
2747-
if figsize is None:
2748-
# our favorite default beating matplotlib's idea of the
2749-
# default size
2750-
figsize = (10, 5)
27512749
fig, axes = _subplots(nrows=nrows, ncols=ncols, naxes=naxes,
27522750
figsize=figsize, sharex=sharex, sharey=sharey, ax=ax)
27532751

0 commit comments

Comments
 (0)