clean up whatsnew, parametrize tests, fix some whitespace issues

pandas-dev · jreback · Aug 10, 2017 · Aug 1, 2017 · Aug 4, 2017 · Aug 4, 2017
commit 9c5e1c16bd1510188bfee95d90e1e8220e5b043a
diff --git a/doc/source/whatsnew/v0.21.0.txt b/doc/source/whatsnew/v0.21.0.txt
@@ -296,8 +296,7 @@ Groupby/Resample/Rolling
 - Bug in :func:`infer_freq` causing indices with 2-day gaps during the working week to be wrongly inferred as business daily (:issue:`16624`)
 - Bug in ``.rolling(...).quantile()`` which incorrectly used different defaults than :func:`Series.quantile()` and :func:`DataFrame.quantile()` (:issue:`9413`, :issue:`16211`)
 - Bug in ``groupby.transform()`` that would coerce boolean dtypes back to float (:issue:`16875`)
-- Bug in ``.rolling(...).apply(...)`` where when rolling apply on DataFrame
-  with Datetime index and min_periods set to be greater than 1 (:issue:`15305`)
+- Bug in ``.rolling(...).apply(...)`` with a ``DataFrame`` with a ``DatetimeIndex``, a ``window`` of a timedelta-convertible and ``min_periods >= 1` (:issue:`15305`)
 
 Sparse
 ^^^^^^

diff --git a/pandas/_libs/window.pyx b/pandas/_libs/window.pyx
@@ -1427,11 +1427,11 @@ def roll_generic(ndarray[float64_t, cast=True] input,
     n = len(input)
     if n == 0:
         return input
-    
+
     counts = roll_sum(np.concatenate([np.isfinite(input).astype(float),
                                       np.array([0.] * offset)]),
                       win, minp, index, closed)[offset:]
-    
+
     start, end, N, win, minp, is_variable = get_window_indexer(input, win,
                                                                minp, index,
                                                                closed,

diff --git a/pandas/tests/test_window.py b/pandas/tests/test_window.py
@@ -423,7 +423,9 @@ def test_constructor_with_timedelta_window(self):
             expected = df.rolling('3D').sum()
             tm.assert_frame_equal(result, expected)
 
-    def test_constructor_with_timedelta_window_and_minperiods(self):
+    @pytest.mark.parametrize(
+        'window', [timedelta(days=3), pd.Timedelta(days=3), '3D'])
+    def test_constructor_with_timedelta_window_and_minperiods(self, window):
         # GH 15305
         n = 10
         df = pd.DataFrame({'value': np.arange(n)},
@@ -435,12 +437,11 @@ def test_constructor_with_timedelta_window_and_minperiods(self):
                                 index=pd.date_range('2017-08-08',
                                                     periods=n,
                                                     freq="D"))
-        for window in [timedelta(days=3), pd.Timedelta(days=3), '3D']:
-            result_roll_sum = df.rolling(window=window, min_periods=2).sum()
-            result_roll_generic = df.rolling(window=window,
-                                             min_periods=2).apply(sum)
-            tm.assert_frame_equal(result_roll_sum, expected)
-            tm.assert_frame_equal(result_roll_generic, expected)
+        result_roll_sum = df.rolling(window=window, min_periods=2).sum()
+            result_roll_generic = df.rolling(window=window,
+                                         min_periods=2).apply(sum)
+        tm.assert_frame_equal(result_roll_sum, expected)
+        tm.assert_frame_equal(result_roll_generic, expected)
 
     def test_numpy_compat(self):
         # see gh-12811