8000 TST: Test cleanup, parametrization for datetime64 arithmetic tests by jbrockmendel · Pull Request #23681 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

TST: Test cleanup, parametrization for datetime64 arithmetic tests #23681

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 13 commits into from
Nov 16, 2018
Merged

TST: Test cleanup, parametrization for datetime64 arithmetic tests #23681

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
28c508e
de-duplicate tests
jbrockmendel Nov 14, 2018
e273d7d
cleanup Period test organization
jbrockmendel Nov 14, 2018
b3665f6
de-duplicate and parametrize-over-box many tests
jbrockmendel Nov 14, 2018
e1b9c8d
decrease verbosity
jbrockmendel Nov 14, 2018
f4775d2
flake8 fixup
jbrockmendel Nov 14, 2018
d355e9d
typo fixup
jbrockmendel Nov 14, 2018
fadb45a
fixup remove unused import
jbrockmendel Nov 14, 2018
497d33a
make utc_objs into a fixture
jbrockmendel Nov 14, 2018
a27f109
imports to the top
jbrockmendel Nov 14, 2018
c24b65f
fixup typo
jbrockmendel Nov 14, 2018
89fe6d9
fix location of tz check
jbrockmendel Nov 15, 2018
d0c0800
Merge branch 'master' of https://github.com/pandas-dev/pandas into at…
jbrockmendel Nov 15, 2018
ddb1662
Merge branch 'master' of https://github.com/pandas-dev/pandas into at…
jbrockmendel Nov 15, 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
Prev Previous commit
Next Next commit
fix location of tz check
  • Loading branch information
@jbrockmendel
jbrockmendel committed Nov 15, 2018
commit 89fe6d99b471f93a0f40053326e4129e5d511ae3
6 changes: 3 additions & 3 deletions pandas/core/arrays/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,6 @@ def _simple_new(cls, values, freq=None, tz=None, **kwargs):
return result

def __new__(cls, values, freq=None, tz=None, dtype=None):
if tz is None and hasattr(values, 'tz'):
# e.g. DatetimeIndex
tz = values.tz

if freq is None and hasattr(values, "freq"):
# i.e. DatetimeArray, DatetimeIndex
Expand All @@ -228,7 +225,10 @@ def __new__(cls, values, freq=None, tz=None, dtype=None):

if isinstance(values, DatetimeArrayMixin):
# extract nanosecond unix timestamps
if tz is None:
tz = values.tz
values = values.asi8

if values.dtype == 'i8':
values = values.view('M8[ns]')

Expand Down
0