COMPAT: numpy compat with NaT != NaT, #12049 #12058
Merged
+55
−24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jreback
added
Build
|
cc @shoyer so just a minor change actually. So ok from me to leave numpy as is I think. (though you still might want to deprecate / do next release in any event) |
| return ((left == right) | (np.isnan(left) & np.isnan(right))).all() | ||
|
|
||
| # numpy will will not allow this type of datetimelike vs integer comparison | ||
| elif is_datetimelike_v_numeric(left, right): | ||
| return False | ||
|
|
||
| # M8/m8 | ||
| elif needs_i8_conversion(left) or needs_i8_conversion(right): |
There was a problem hiding this comment.
we also need to check dtypes -- both timedelta or both datetime
|
I think that people will be unhappy if numpy issues a release that breaks the latest release of pandas.... so I think numpy needs to wait either way. |
jreback
force-pushed
the
array_equivalent
branch
from
34a69fa to
34abc4a
Compare
|
ok should be good now. if its changed to a |
| @@ -322,20 +324,40 @@ def test_array_equivalent(): | |||
| np.array([np.nan, 1, np.nan])) | |||
| assert array_equivalent(np.array([np.nan, None], dtype='object'), | |||
| np.array([np.nan, None], dtype='object')) | |||
| assert array_equivalent(np.array([np.nan, 1+1j], dtype='complex'), | |||
There was a problem hiding this comment.
glad to see some pep8 clean up :)
There was a problem hiding this comment.
I have gotten religion err flake8
|
LGTM |
|
now if Travis-CI would just work :< notice its been red all day |
jreback
force-pushed
the
array_equivalent
branch
from
34abc4a to
358a334
Compare
jreback
added a commit
that referenced
this pull request
Jan 16, 2016
COMPAT: numpy compat with NaT != NaT, #12049
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #12049