Skip to content

BUG: use entire size of DatetimeTZBlock when coercing result (#15855) #15924

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

Jump to bottom
Merged
merged 4 commits into from
Apr 7, 2017
Merged

BUG: use entire size of DatetimeTZBlock when coercing result (#15855) #15924

merged 4 commits into from
Apr 7, 2017

Conversation

chrisaycock
Copy link
Contributor

@codecov
Copy link

codecov bot commented Apr 6, 2017

Codecov Report

Merging #15924 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15924      +/-   ##
==========================================
- Coverage   90.96%   90.96%   -0.01%     
==========================================
  Files         145      145              
  Lines       49557    49557              
==========================================
- Hits        45081    45079       -2     
- Misses       4476     4478       +2
Flag Coverage Δ
#multiple 88.72% <100%> (-0.01%) ⬇️
#single 40.61% <0%> (ø) ⬆️
Impacted Files Coverage Δ
pandas/core/internals.py 93.54% <100%> (-0.08%) ⬇️
pandas/tseries/index.py 95.33% <0%> (-0.1%) ⬇️
pandas/core/common.py 91.03% <0%> (+0.34%) ⬆️

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 4502e82...35912e1. Read the comment docs.

@codecov
Copy link

codecov bot commented Apr 6, 2017 •
edited
Loading

Codecov Report

Merging #15924 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15924      +/-   ##
==========================================
+ Coverage   90.96%   90.98%   +0.01%     
==========================================
  Files         145      145              
  Lines       49557    49521      -36     
==========================================
- Hits        45081    45058      -23     
+ Misses       4476     4463      -13
Flag Coverage Δ
#multiple 88.75% <100%> (+0.02%) ⬆️
#single 40.61% <0%> (ø) ⬆️
Impacted Files Coverage Δ
pandas/core/internals.py 93.54% <100%> (-0.08%) ⬇️
pandas/types/common.py 93.64% <0%> (-0.3%) ⬇️
pandas/tseries/index.py 95.33% <0%> (-0.1%) ⬇️
pandas/core/series.py 94.89% <0%> (-0.08%) ⬇️
pandas/indexes/base.py 96.09% <0%> (-0.06%) ⬇️
pandas/core/reshape.py 99.27% <0%> (-0.01%) ⬇️
pandas/core/frame.py 97.57% <0%> (ø) ⬆️
pandas/io/pytables.py 93.06% <0%> (ø) ⬆️
pandas/core/sorting.py 97.81% <0%> (+0.03%) ⬆️
... and 4 more

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 4502e82...431b630. Read the comment docs.

@jreback jreback added Bug Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Timezones Timezone data dtype labels Apr 7, 2017
@jreback jreback added this to the 0.20.0 milestone Apr 7, 2017
jreback
jreback reviewed Apr 7, 2017
View reviewed changes
pandas/tests/indexes/datetimes/test_missing.py Outdated
@@ -48,3 +48,11 @@ def test_fillna_datetime64(self):
pd.Timestamp('2011-01-01 11:00', tz=tz)],
dtype=object)
self.assert_index_equal(idx.fillna('x'), exp)

def test_fillna_timezone(self):
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 move to pandas/tests/frames/test_missing.py; also add a test in series/test_missing.py (if not already there).

can you also test with backfill (for both)

jreback
jreback reviewed Apr 7, 2017
View reviewed changes
pandas/tests/frame/test_missing.py Outdated
pd.NaT]})
exp = pd.DataFrame({'A': [pd.Timestamp('2012-11-11 00:00:00+01:00'),
pd.Timestamp('2012-11-11 00:00:00+01:00')]})
self.assert_frame_equal(df.fillna(method='pad'), exp)
Copy link
Contributor

Choose a reason for hiding this comment

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

try to not use self. here, just assert_frame_equal (or tm.assert_frame_equal).

jreback
jreback reviewed Apr 7, 2017
View reviewed changes
pandas/tests/series/test_missing.py Outdated
df = pd.Series([pd.Timestamp('2012-11-11 00:00:00+01:00'), pd.NaT])
exp = pd.Series([pd.Timestamp('2012-11-11 00:00:00+01:00'),
pd.Timestamp('2012-11-11 00:00:00+01:00')])
self.assert_series_equal(df.fillna(method='pad'), exp)
Copy link
Contributor

Choose a reason for hiding this comment

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

here too :>

@jreback jreback merged commit 6d90a43 into pandas-dev:master Apr 7, 2017
@jreback
Copy link
Contributor

jreback commented Apr 7, 2017

thank you sir!

@chrisaycock chrisaycock deleted the GH15855 branch April 7, 2017 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jreback jreback jreback left review comments

Assignees
No one assigned
Labels
Bug Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Timezones Timezone data dtype
Projects
None yet
Milestone
0.20.0
Development

Successfully merging this pull request may close these issues.

BUG: fillna() for tz-aware timestamps causes an exception
2 participants
@chrisaycock @jreback