-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
fixes for warnings related to unit tests and nan comparisons #1657
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.
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
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
4ba28bb
fixes for warnings related to unit tests
df2d3ef
more warnings fixes
8d775bb
fix some numpy warnings using numpy.seterr
ed838f6
remove pytest command line argument that raises errors when warnings …
0a79e83
remove extra np.errstate(all=ignore) context managers
8311f0b
Merge branch 'master' of github.com:pydata/xarray into fix/1652
d70258a
add whats new note
5e61d8c
fix merge conflicts
bd68222
allow cleanup failures on scipy/netcdf4 test
53b1e4a
fix bad merge resolution
e5999c1
Merge branch 'master' into fix/1652
shoyer c2126fc
Merge branch 'master' into fix/1652
shoyer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1571,7 +1571,9 @@ def __array_wrap__(self, obj, context=None): | |
def _unary_op(f): | ||
@functools.wraps(f) | ||
def func(self, *args, **kwargs): | ||
return self.__array_wrap__(f(self.variable.data, *args, **kwargs)) | ||
with np.errstate(all='ignore'): | ||
return self.__array_wrap__(f(self.variable.data, *args, | ||
**kwargs)) | ||
|
||
return func | ||
|
||
|
@@ -1588,9 +1590,10 @@ def func(self, other): | |
other_variable = getattr(other, 'variable', other) | ||
other_coords = getattr(other, 'coords', None) | ||
|
||
variable = (f(self.variable, other_variable) | ||
if not reflexive | ||
else f(other_variable, self.variable)) | ||
with np.errstate(all='ignore'): | ||
variable = (f(self.variable, other_variable) | ||
if not reflexive | ||
else f(other_variable, self.variable)) | ||
coords = self.coords._merge_raw(other_coords) | ||
name = self._result_name(other) | ||
|
||
|
@@ -1612,7 +1615,8 @@ def func(self, other): | |
other_coords = getattr(other, 'coords', None) | ||
other_variable = getattr(other, 'variable', other) | ||
with self.coords._merge_inplace(other_coords): | ||
f(self.variable, other_variable) | ||
with np.errstate(all='ignore'): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also probably unneeded |
||
f(self.variable, other_variable) | ||
return self | ||
|
||
return func | ||
|
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need this here -- this should be caught at the level of the
Variable
wrapper.