-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: Make sure correct values are passed to Rolling._on when axis=1 #28267
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
mroeschke
merged 6 commits into
pandas-dev:master
from
MarcoGorelli:the-rolling-datetimes
Sep 4, 2019
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3029785
Make sure correct values are passed to Rolling._on when axis=1
7f56eb4
Update rolling.py
MarcoGorelli 4ac1cb6
Capitalise 'd' as in documentation
8bb31de
Merge branch 'the-rolling-datetimes' of https://github.com/MarcoGorel…
9611910
Parametrize over tz_naive_fixture
f9cec77
autoformat
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -334,3 +334,26 @@ def test_readonly_array(self): | |
result = pd.Series(arr).rolling(2).mean() | ||
expected = pd.Series([np.nan, 2, np.nan, np.nan, 4]) | ||
tm.assert_series_equal(result, expected) | ||
|
||
def test_rolling_datetime(self, axis_frame): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One last thing: Could you parameterize over the |
||
# GH-28192 | ||
df = pd.DataFrame( | ||
{i: [1] * 2 for i in pd.date_range("2019-8-01", "2019-08-03", freq="D")} | ||
) | ||
if axis_frame in [0, "index"]: | ||
result = df.T.rolling("2d", axis=axis_frame).sum().T | ||
else: | ||
result = df.rolling("2d", axis=axis_frame).sum() | ||
expected = pd.DataFrame( | ||
{ | ||
**{ | ||
i: [1.0] * 2 | ||
for i in pd.date_range("2019-8-01", periods=1, freq="D") | ||
}, | ||
**{ | ||
i: [2.0] * 2 | ||
for i in pd.date_range("2019-8-02", "2019-8-03", freq="D") | ||
}, | ||
} | ||
) | ||
tm.assert_frame_equal(result, expected) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can just call
self.obj.columns
instead of having to transpose.