added version/issue info for 8839

pandas-dev · jreback · Nov 19, 2018 · Jul 7, 2018 · Jul 7, 2018 · Jul 13, 2018
commit adf543d652cdcb72f3310eb3c1d8dc51a5264dab
diff --git a/doc/source/whatsnew/v0.24.0.txt b/doc/source/whatsnew/v0.24.0.txt
@@ -182,6 +182,8 @@ Other Enhancements
 - :func:`to_timedelta` now supports iso-formated timedelta strings (:issue:`21877`)
 - :class:`Series` and :class:`DataFrame` now support :class:`Iterable` in constructor (:issue:`2193`)
 - :class:`DatetimeIndex` gained :attr:`DatetimeIndex.timetz` attribute. Returns local time with timezone information. (:issue:`21358`)
+- :func:`between_time` and :func:`at_time` now support an axis parameter (:issue: `8839`)
+-
 
 .. _whatsnew_0240.api_breaking:
 

diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -7027,6 +7027,9 @@ def at_time(self, time, asof=False, axis=None):
         time : datetime.time or string
         axis : int or string axis name, optional
 
+            .. versionadded:: 0.24.0
+
+
         Returns
         -------
         values_at_time : same type as caller
@@ -7087,6 +7090,8 @@ def between_time(self, start_time, end_time, include_start=True,
         include_end : boolean, default True
         axis : int or string axis name, optional
 
+            .. versionadded:: 0.24.0
+
         Returns
         -------
         values_between_time : same type as caller

diff --git a/pandas/tests/frame/test_timeseries.py b/pandas/tests/frame/test_timeseries.py
@@ -640,21 +640,26 @@ def test_at_time_raises(self):
         with pytest.raises(TypeError):  # index is not a DatetimeIndex
             df.at_time('00:00')
 
-    def test_at_time_axis(self):
+    @pytest.mark.parametrize('time_axis', [
+        (False, False), (True, False), (False, True), (True, True)])
+    def test_at_time_axis(self, time_axis):
+        # issue 8839
         rng = date_range('1/1/2000', '1/5/2000', freq='5min')
         ts = DataFrame(np.random.randn(len(rng), len(rng)))
 
         indices = rng[(rng.hour == 9) & (rng.minute == 30) & (rng.second == 0)]
 
-        ts.index = rng
-        expected = ts.loc[indices]
-        result = ts.at_time('9:30', axis=0)
-        assert_frame_equal(result, expected)
+        if time_axis[0]:
+            ts.index = rng
+            expected = ts.loc[indices]
+            result = ts.at_time('9:30', axis=0)
+            assert_frame_equal(result, expected)
 
-        ts.columns = rng
-        expected = ts.loc[:, indices]
-        result = ts.at_time('9:30', axis=1)
-        assert_frame_equal(result, expected)
+        if time_axis[1]:
+            ts.columns = rng
+            expected = ts.loc[:, indices]
+            result = ts.at_time('9:30', axis=1)
+            assert_frame_equal(result, expected)
 
     def test_between_time(self):
         rng = date_range('1/1/2000', '1/5/2000', freq='5min')
@@ -722,36 +727,39 @@ def test_between_time_raises(self):
         with pytest.raises(TypeError):  # index is not a DatetimeIndex
             df.between_time(start_time='00:00', end_time='12:00')
 
-        def test_between_time_axis(self):
+    @pytest.mark.parametrize('time_axis', [
+        (False, False), (True, False), (False, True), (True, True)])
+    def test_between_time_axis(self, time_axis):
+        # issue 8839
         rng = date_range('1/1/2000', periods=100, freq='10min')
         blank = np.arange(0, len(rng))
         stime, etime = ('08:00:00', '09:00:00')
-        dimn = (len(rng), len(rng))
+        rand_data = np.random.randn(len(rng), len(rng))
         exp_len = 7
-        for time_index, time_col in product([True, False], [True, False]):
-            if time_index:
-                index = rng
-            else:
-                index = blank
-            if time_col:
-                col = rng
-            else:
-                col = blank
-
-            ts = DataFrame(np.random.randn(*dimn), index=index, columns=col)
-
-            if time_index:
-                assert len(ts.between_time(stime, etime)) == exp_len
-                assert len(ts.between_time(stime, etime, axis=0)) == exp_len
-            else:
-                pytest.raises(TypeError, ts.between_time, stime, etime)
-                pytest.raises(TypeError, ts.between_time, stime, etime, axis=0)
-
-            if time_col:
-                selected = ts.between_time(stime, etime, axis=1).columns
-                assert len(selected) == exp_len
-            else:
-                pytest.raises(TypeError, ts.between_time, stime, etime, axis=1)
+
+        if time_axis[0]:
+            index = rng
+        else:
+            index = blank
+        if time_axis[1]:
+            col = rng
+        else:
+            col = blank
+
+        ts = DataFrame(rand_data, index=index, columns=col)
+
+        if time_axis[0]:
+            assert len(ts.between_time(stime, etime)) == exp_len
+            assert len(ts.between_time(stime, etime, axis=0)) == exp_len
+        else:
+            pytest.raises(TypeError, ts.between_time, stime, etime)
+            pytest.raises(TypeError, ts.between_time, stime, etime, axis=0)
+
+        if time_axis[1]:
+            selected = ts.between_time(stime, etime, axis=1).columns
+            assert len(selected) == exp_len
+        else:
+            pytest.raises(TypeError, ts.between_time, stime, etime, axis=1)
 
     def test_operation_on_NaT(self):
         # Both NaT and Timestamp are in DataFrame.

diff --git a/pandas/tests/series/test_timeseries.py b/pandas/tests/series/test_timeseries.py
@@ -826,6 +826,7 @@ def test_between_time_formats(self):
             assert len(ts.between_time(*time_string)) == expected_length
 
     def test_between_time_axis(self):
+        # issue 8839
         rng = date_range('1/1/2000', periods=100, freq='10min')
         ts = Series(np.random.randn(len(rng)), index=rng)
         stime, etime = ('08:00:00', '09:00:00')