pull_requests: 83548075

This data as json

id node_id number state locked title user body created_at updated_at closed_at merged_at merge_commit_sha assignee milestone draft head base author_association auto_merge repo url merged_by
83548075 MDExOlB1bGxSZXF1ZXN0ODM1NDgwNzU= 996 closed 0 add 'no_conflicts' as compat option for merging non-conflicting data 8982598 This solves #742 and partially #835 (does not address a combine_first option yet). It essentially adds a notnull_equals method to Variable (and currently DataArray/set) that merge can use to compare objects, subsequently combining them with 'fillna'. Used as such: ``` python >>> import xarray as xr >>> ds1 = xr.Dataset(data_vars={'x': ('a', [1, 2])}) >>> ds2 = xr.Dataset(data_vars={'x': ('a', [2, 3])}, coords={'a': [1, 2]}) >>> xr.merge([ds1, ds2], compat='notnull_equals') <xarray.Dataset> Dimensions: (a: 3) Coordinates: * a (a) int64 0 1 2 Data variables: x (a) float64 1.0 2.0 3.0 ``` Should be very easy to add other merging options such as overwriting left to write and vice versa. ## TODO - docs - tests for various type combinations - some of the error excepting is mirrored from `equals` and might not be necessary (e.g. for numpy structured arrays). ## ISSUES - It seemed natural to add notnull_equals as a method to Dataset, but it might be unnecessary/not useful. Current version is conservative in that it still requires aligned Datasets with all the same variables. - Due to the float nature of NaN, type is sometimes not preserved, e.g. merging two int arrays yields a float array, even when the final array has no NaN values itself. - float rounding errors can cause unintended failures, so a notnull_allclose option might be nice. Currently all tests passing (6 new), and no flake8 errors on the diff... 2016-08-31T23:38:00Z 2016-09-15T16:07:16Z 2016-09-15T16:07:16Z 2016-09-15T16:07:16Z f40d323c76f6cab9615567e4ba7afde7860f7775     0 0e814386aebbeb40c8c9c5eff79b5f31904997ba 41654ef5e9da8cd15f3b68f8384f8c45c7fc16e9 CONTRIBUTOR   13221727 https://github.com/pydata/xarray/pull/996  

Links from other tables