Skip to content

BUG: Fix some PeriodIndex resampling issues #16153

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.

Sign up for GitHub

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
merged 20 commits into from
Oct 1, 2017
Merged

BUG: Fix some PeriodIndex resampling issues #16153

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ca7b6f2
CLN: move PeriodIndex binning code to TimeGrouper
winklerand Apr 26, 2017
c27f430
TST/CLN: raise error when resampling with on= or level= selection
winklerand Apr 26, 2017
390e16e
BUG: resampling PeriodIndex now returns PeriodIndex (GH 12884, 15944)
winklerand Apr 26, 2017
23566c2
BUG: OHLC-upsampling of PeriodIndex now returns DataFrame (GH 13083)
winklerand Apr 26, 2017
a82879d
BUG: enable resampling with NaT in PeriodIndex (GH 13224)
winklerand Apr 26, 2017
4b1c740
CLN: remove warning on falling back to tstamp resampling with loffset
winklerand Apr 30, 2017
73c0990
CLN: use memb._isnan for NaT masking
winklerand May 1, 2017
fa6c1d3
DOC: added issue reference for OHLC resampling
winklerand May 1, 2017
7ea04e9
STYLE: added blank lines
winklerand May 1, 2017
82a8275
TST: convert to parametrized tests / pytest idiom
winklerand May 6, 2017
432c623
CLN/TST: call assert_almost_equal() when comparing Series/DataFrames
winklerand May 6, 2017
c8814fb
STYLE: added blank lines, removed odd whitespace, fixed typo
winklerand May 13, 2017
486ad67
TST: add test case for multiple consecutive NaTs in PeriodIndex
winklerand May 13, 2017
ad8519f
TST/DOC: added issue number to test case
winklerand May 13, 2017
39fc7e2
TST: consolidate test_asfreq_downsample, test_asfreq_upsample -> test…
winklerand May 13, 2017
efcad5b
TST: set fixtures to default function scoping
winklerand May 13, 2017
41401d4
TST: convert constant 'setup-like' values/objects to pytest fixtures
winklerand May 13, 2017
398a684
DOC: whatsnew v0.21.0 entry (in API changes section)
winklerand May 21, 2017
8358c41
fixups
jreback Sep 28, 2017
6084e0c
moar whatsnew
jreback Sep 29, 2017
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
Prev Previous commit
Next Next commit
CLN: remove warning on falling back to tstamp resampling with loffset
  • Loading branch information
@winklerand @jreback
winklerand authored and jreback committed Sep 29, 2017
commit 4b1c740e67ec1508eae15ebfcef30a49663feb03
6 changes: 2 additions & 4 deletions pandas/core/resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,10 +850,8 @@ def _convert_obj(self, obj):
raise NotImplementedError(msg)

if self.loffset is not None:
if self.kind == 'period':
print('Warning: loffset -> convert PeriodIndex to timestamps')
# Cannot apply loffset/timedelta to PeriodIndex -> convert to
# timestamps
# Cannot apply loffset/timedelta to PeriodIndex -> convert to
# timestamps
Copy link
Contributor

@jreback jreback Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we show a warning for this?
Copy link
Member

@gfyoung gfyoung Jul 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should, given that we kind of did that before (it was print statement with a warning!?)
self.kind = 'timestamp'

# convert to timestamp
Expand Down