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.

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

Fix pd.NaT - Series #19251

Merged
merged 5 commits into from
Jan 16, 2018
Merged

Fix pd.NaT - Series #19251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc4ec15
fix 19158
jbrockmendel Jan 10, 2018
a8ad94e
Merge branch 'master' of https://github.com/pandas-dev/pandas into na…
jbrockmendel Jan 15, 2018
c0a39df
restore whitespace
jbrockmendel Jan 15, 2018
577b337
Merge branch 'master' of https://github.com/pandas-dev/pandas into na…
jbrockmendel Jan 16, 2018
dbb2a82
un-xfail test now that #19139 is merged
jbrockmendel Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/source/whatsnew/v0.23.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,10 @@ Conversion
- Bug in :class:`WeekOfMonth` and :class:`LastWeekOfMonth` where default keyword arguments for constructor raised ``ValueError`` (:issue:`19142`)
- Bug in localization of a naive, datetime string in a ``Series`` constructor with a ``datetime64[ns, tz]`` dtype (:issue:`174151`)
- :func:`Timestamp.replace` will now handle Daylight Savings transitions gracefully (:issue:`18319`)


Copy link
Contributor

Choose a reason for hiding this comment

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

pls leave white space this is on purpose to avoid conflicts

Copy link
Member Author

Choose a reason for hiding this comment

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

Gotcha, will fix.


-
-
- Bug in ``.astype()`` to non-ns timedelta units would hold the incorrect dtype (:issue:`19176`, :issue:`19223`, :issue:`12425`)
- Bug in subtracting :class:`Series` from ``NaT`` incorrectly returning ``NaT`` (:issue:`19158`)


Indexing
Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/nattype.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ cdef class _NaT(datetime):
neg_other = -other
return self + neg_other

elif getattr(other, '_typ', None) in ['period',
elif getattr(other, '_typ', None) in ['period', 'series',
'periodindex', 'dateoffset']:
return NotImplemented

Expand Down
3 changes: 1 addition & 2 deletions pandas/tests/scalar/test_nat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,7 @@ def test_nat_arithmetic_index():

@pytest.mark.parametrize('box, assert_func', [
(TimedeltaIndex, tm.assert_index_equal),
pytest.param(Series, tm.assert_series_equal,
marks=pytest.mark.xfail(reason='NaT - Series returns NaT'))
(Series, tm.assert_series_equal)
])
def test_nat_arithmetic_td64_vector(box, assert_func):
# GH#19124
Expand Down