8000 dispatch Series[datetime64] comparison ops to DatetimeIndex by jbrockmendel · Pull Request #19800 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

dispatch Series[datetime64] comparison ops to DatetimeIndex #19800

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 16 commits into from
Mar 1, 2018
Merged

dispatch Series[datetime64] comparison ops to DatetimeIndex #19800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1990e3f
dispatch Series[datetime64] comparison ops to DatetimeIndex
jbrockmendel Feb 20, 2018
f48e6d5
remove unsupported case
jbrockmendel Feb 20, 2018
bd909b0
fix error in older numpys
jbrockmendel Feb 20, 2018
003c4ff
Fixup copy/paste
jbrockmendel Feb 21, 2018
f942be9
unwrap Series to try to debug appveyor breakage
jbrockmendel Feb 21, 2018
59c96e8
port test for None comparison
jbrockmendel Feb 21, 2018
25534c6
troubleshoot appveyor build
jbrockmendel Feb 21, 2018
3d15998
continue troubleshooting Appveyor
jbrockmendel Feb 21, 2018
db487e8
test for date comparison
jbrockmendel Feb 22, 2018
ba290ab
just use isna
jbrockmendel Feb 22, 2018
f8d5bdd
comments
jbrockmendel Feb 24, 2018
9e59598
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 24, 2018
b618a82
comment
jbrockmendel Feb 24, 2018
35db0a2
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 25, 2018
3911541
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Mar 1, 2018
ff51634
Update ops.py
jbrockmendel Mar 1, 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
comments
  • Loading branch information
@jbrockmendel
jbrockmendel committed Feb 24, 2018
commit f8d5bddabdce0d90ef10ddfa9de1013138a4ceff
2 changes: 2 additions & 0 deletions pandas/core/indexes/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ def wrapper(self, other):
result = func(np.asarray(other))
result = com._values_from_object(result)

# Make sure to pass an array to result[...]; indexing with
# Series breaks with older version of numpy
o_mask = np.array(isna(other))
Copy link
Contributor

Choose a reason for hiding this comment

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

why do you need the np.array?

Copy link
Member Author

Choose a reason for hiding this comment

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

Test failures with older versions of numpy when o_mask is a Series.

Copy link
Contributor
@jreback jreback Feb 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

grr. ok, use np.asarray though

if o_mask.any():
result[o_mask] = nat_result
Expand Down
2 changes: 2 additions & 0 deletions pandas/core/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,8 @@ def wrapper(self, other, axis=None):
name=res_name)

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 some comments at various places

if is_datetime64_dtype(self) or is_datetime64tz_dtype(self):
# Dispatch to DatetimeIndex to ensure identical
# Series/Index behavior
res_values = dispatch_to_index_op(op, self, other,
pd.DatetimeIndex)
return self._constructor(res_values, index=self.index,
Expand Down
0