From a26b1a58bac3ed7ed85c0621023d80182fe75c4f Mon Sep 17 00:00:00 2001 From: dcherian Date: Tue, 6 Aug 2019 08:45:28 -0600 Subject: [PATCH] Revert "Add coords='skip_nondim'" This reverts commit 8263d383de877ea5ddb07d407604976f7d437eb4. --- xarray/core/concat.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/xarray/core/concat.py b/xarray/core/concat.py index 9a32b796df6..cd59d87870e 100644 --- a/xarray/core/concat.py +++ b/xarray/core/concat.py @@ -43,10 +43,7 @@ def concat(objs, dim=None, data_vars='all', coords='different', coords : {'minimal', 'different', 'all' or list of str}, optional These coordinate variables will be concatenated together: * 'minimal': Only coordinates in which the dimension already appears - are concatenated. Non-dimensional coordinates will be checked for - equality. - * 'skip_nondim': Same as minimal but avoids checking nondimensional - coordinates for equality. + are included. * 'different': Coordinates which are not equal (ignoring attributes) across all datasets are also concatenated (as well as all for which dimension already appears). Beware: this option may load the data @@ -193,8 +190,6 @@ def process_subset_opt(opt, subset): set(datasets[0].dims)) elif opt == 'minimal': pass - elif opt == 'skip_nondim' and subset == 'coords': - pass else: raise ValueError("unexpected value for %s: %s" % (subset, opt)) else: @@ -263,13 +258,6 @@ def insert_result_variable(k, v): elif (k in result_coord_names) != (k in ds.coords): raise ValueError('%r is a coordinate in some datasets but not ' 'others' % k) - elif ((k in result_coord_names) - and (k in result_vars) - and (k not in ds.dims) - and (coords == 'skip_nondim')): - # skip comparison of non dimensional coords when ask to - # concatenate only over dim_coords if needed - pass elif k in result_vars and k != dim: # Don't use Variable.identical as it internally invokes # Variable.equals, and we may already know the answer