Skip to content

Add timestamp method+test; closes #17329 #17906

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 17 commits into from
Oct 27, 2017
Merged

Add timestamp method+test; closes #17329 #17906

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f9e2ad5
Add timestamp method+test; closes #17329
jbrockmendel Oct 17, 2017
aa7b06d
whatsnew entry
jbrockmendel Oct 17, 2017
4155b03
typo fixup tz-->tzinfo
jbrockmendel Oct 17, 2017
c73c2fe
fixup python-->Python
jbrockmendel Oct 17, 2017
66d4a2b
Add timestamp method to NaT in py2
jbrockmendel Oct 17, 2017
54ebd13
fix docstring mismatch
jbrockmendel Oct 17, 2017
a88419d
add docstring, test against timestamp in py3
jbrockmendel Oct 17, 2017
49accab
add timestamp to api.rst
jbrockmendel Oct 17, 2017
698e688
fixup missing import
jbrockmendel Oct 18, 2017
5eed82b
typo fixup
jbrockmendel Oct 20, 2017
715b740
fix timestamp test
jbrockmendel Oct 20, 2017
b7747ec
add test for NaT.timestamp
jbrockmendel Oct 20, 2017
237be98
Move nat timestamp test to test_nat
jbrockmendel Oct 21, 2017
a775671
round timestamp to 6 digits; merge nat test
jbrockmendel Oct 21, 2017
8f6d8d5
remove rounding from timestamp test
jbrockmendel Oct 21, 2017
580a1c6
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Oct 27, 2017
7992462
move whatsnew to 0.21.1
jbrockmendel Oct 27, 2017
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
Prev Previous commit
Next Next commit
typo fixup tz-->tzinfo
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 17, 2017
commit 4155b0321aeda0448f787bdf0dd432a83165714c
2 changes: 1 addition & 1 deletion pandas/tests/scalar/test_timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ def test_timestamp(self):
# Gh#17329
# tz-naive --> treat it as if it were UTC for purposes of timestamp()
ts = Timestamp.now()
Copy link
Contributor

Choose a reason for hiding this comment

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

test versus a datetime.timestamp() value here (as well)

Copy link
Contributor

Choose a reason for hiding this comment

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

e.g. ts.to_pydatetime().timestamp()

uts = ts.replace(tz=utc)
uts = ts.replace(tzinfo=utc)
assert ts.timestamp() == uts.timestamp()

tsc = Timestamp('2014-10-11 11:00:01.12345678', tz='US/Central')
Copy link
Contributor

Choose a reason for hiding this comment

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

can u maker sure test for mat is ok?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't understand the question.

Copy link
Contributor

Choose a reason for hiding this comment

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

for NaT

Expand Down