Skip to content
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

bugfix for FY5253 case with bunched yearends #18550

Merged
merged 7 commits into from
Dec 6, 2017

Conversation

jbrockmendel
Copy link
Member

@jbrockmendel jbrockmendel commented Nov 28, 2017

Also achieves coverage for one of the uncovered branches in FY5253.apply

@codecov
Copy link

codecov bot commented Nov 28, 2017

Codecov Report

Merging #18550 into master will decrease coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #18550      +/-   ##
==========================================
- Coverage   91.35%   91.31%   -0.04%     
==========================================
  Files         164      164              
  Lines       49802    49804       +2     
==========================================
- Hits        45496    45478      -18     
- Misses       4306     4326      +20
Flag Coverage Δ
#multiple 89.11% <100%> (-0.03%) ⬇️
#single 40.81% <0%> (-0.07%) ⬇️
Impacted Files Coverage Δ
pandas/tseries/offsets.py 96.98% <100%> (+0.08%) ⬆️
pandas/io/gbq.py 25% <0%> (-58.34%) ⬇️
pandas/plotting/_converter.py 63.44% <0%> (-1.82%) ⬇️
pandas/core/frame.py 97.81% <0%> (-0.1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2a0e54b...edb8b85. Read the comment docs.

@codecov
Copy link

codecov bot commented Nov 28, 2017

Codecov Report

Merging #18550 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #18550      +/-   ##
==========================================
- Coverage   91.59%   91.58%   -0.02%     
==========================================
  Files         153      153              
  Lines       51221    51223       +2     
==========================================
- Hits        46917    46911       -6     
- Misses       4304     4312       +8
Flag Coverage Δ
#multiple 89.44% <100%> (ø) ⬆️
#single 40.67% <0%> (-0.11%) ⬇️
Impacted Files Coverage Δ
pandas/tseries/offsets.py 96.94% <100%> (+0.08%) ⬆️
pandas/io/gbq.py 25% <0%> (-58.34%) ⬇️
pandas/core/frame.py 97.81% <0%> (-0.1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13f6267...566e498. Read the comment docs.

@jreback jreback added Bug Frequency DateOffsets labels Nov 28, 2017
@jreback
Copy link
Contributor

jreback commented Nov 28, 2017

cc @cancan101 if you could have a look / try out.

@jreback
Copy link
Contributor

jreback commented Nov 28, 2017

release note pls.

@jbrockmendel
Copy link
Member Author

Ping.

dt = Timestamp('2004-01-01')
assert fy.rollback(dt) == Timestamp('2002-12-28')
assert (-fy).apply(dt) == Timestamp('2002-12-28')
assert dt - fy == Timestamp('2002-12-28')
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add from the OP: fy.rollback(pd.Timestamp('2003-12-31')) (which I think is the same result) as well

@jreback
Copy link
Contributor

jreback commented Dec 3, 2017

cc @ronif can you have a look.

@jreback jreback added this to the 0.22.0 milestone Dec 3, 2017
@jbrockmendel
Copy link
Member Author

Just rebased and pushed; no new changes.

@jreback jreback merged commit 9434a5a into pandas-dev:master Dec 6, 2017
@jreback
Copy link
Contributor

jreback commented Dec 6, 2017

thanks

@jbrockmendel jbrockmendel deleted the fy52err branch December 6, 2017 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Frequency DateOffsets
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AssertionError in FY5253.rollback()
2 participants