Merge pull request #6822 from cpcloud/no-random-hist-by-test

TST/BUG: make the gender variable non random in test_hist_by_no_extra_plots

Author: cpcloud

pandas/tests/test_graphics.py

@@ -182,7 +182,7 @@ def test_plot_fails_with_dupe_color_and_style(self):
     def test_hist_by_no_extra_plots(self):
         import matplotlib.pyplot as plt
         n = 10
-        df = DataFrame({'gender': tm.choice(['Male', 'Female'], size=n),
+        df = DataFrame({'gender': ['Male'] * 5 + ['Female'] * 5,
                         'height': random.normal(66, 4, size=n)})
         axes = df.height.hist(by=df.gender)
         self.assertEqual(len(plt.get_fignums()), 1)
@@ -593,9 +593,9 @@ def test_bar_linewidth(self):
     @slow
     def test_bar_barwidth(self):
         df = DataFrame(randn(5, 5))
-        
+
         width = 0.9
-        
+
         # regular
         ax = df.plot(kind='bar', width=width)
         for r in ax.patches:
@@ -681,7 +681,7 @@ def _check_bar_alignment(self, df, kind='bar', stacked=False,
                        align=align, width=width, position=position,
                        grid=True)
 
-        tick_pos = np.arange(len(df)) 
+        tick_pos = np.arange(len(df))
 
         if not isinstance(axes, np.ndarray):
             axes = [axes]
@@ -780,7 +780,7 @@ def test_bar_subplots_center(self):
             self.assertEqual(ax.get_xlim(), (-0.5, 4.75))
 
         self._check_bar_alignment(df, kind='bar', subplots=True, width=0.9)
-        
+
         axes = self._check_bar_alignment(df, kind='barh', subplots=True)
         for ax in axes:
             self.assertEqual(ax.get_ylim(), (-0.5, 4.75))

pandas/tools/plotting.py

@@ -221,7 +221,7 @@ def scatter_matrix(frame, alpha=0.5, figsize=None, ax=None, grid=False,
         either Kernel Density Estimation or Histogram
         plot in the diagonal
     marker : str, optional
-        Matplotlib marker type, default '.'    
+        Matplotlib marker type, default '.'
     hist_kwds : other plotting keyword arguments
         To be passed to hist function
     density_kwds : other plotting keyword arguments
@@ -1678,7 +1678,7 @@ def __init__(self, data, **kwargs):
 
         kwargs['align'] = kwargs.pop('align', 'center')
         self.tick_pos = np.arange(len(data))
- 
+
         self.log = kwargs.pop('log',False)
         MPLPlot.__init__(self, data, **kwargs)