8000 propagate indexes in to_dataset, from_dataset by dcherian · Pull Request #3519 · pydata/xarray · GitHub
[go: up one dir, main page]
Skip to content

propagate indexes in to_dataset, from_dataset #3519

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 14 commits into from
Nov 22, 2019
Merged

propagate indexes in to_dataset, from_dataset #3519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
97e44a2
Propagate indexes in _to_dataset, _from_dataset
dcherian Nov 11, 2019
1c9373f
Make Indexes immutable again.
dcherian Nov 12, 2019
3a28951
Fix DataArrayGroupby._combine.
dcherian Nov 13, 2019
b902f97
Don't create indexes by default.
dcherian Nov 13, 2019
10e1f4d
fix to_dataset_Splt
dcherian Nov 13, 2019
433ba71
undo groupby change
dcherian Nov 13, 2019
1bffa83
ccomment
dcherian Nov 13, 2019
bba1840
Update xarray/core/indexes.py
dcherian Nov 13, 2019
aefa5e3
Bad idea to deep copy indexes.
dcherian Nov 17, 2019
747962d
Merge remote-tracking branch 'upstream/master' into indexes/dataarray
dcherian Nov 17, 2019
e97a1b2
Merge branch 'indexes/dataarray' of github.com:dcherian/xarray into i…
dcherian Nov 17, 2019
6ae75c0
remove unnecessary copy_indexes calls.
dcherian Nov 17, 2019
73e8e12
copy_indexes → propagate_indexes
dcherian Nov 22, 2019
d7cab03
more renaming.
dcherian Nov 22, 2019
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
copy_indexes → propagate_indexes
  • Loading branch information
@dcherian
dcherian committed Nov 22, 2019
commit 73e8e120c5ff993855a6866075d23232e14c1e2c
8 changes: 4 additions & 4 deletions xarray/core/dataarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
)
from .dataset import Dataset, split_indexes
from .formatting import format_item
from .indexes import Indexes, copy_indexes, default_indexes
from .indexes import Indexes, propagate_indexes, default_indexes
from .merge import PANDAS_TYPES, _extract_indexes_from_coords
from .options import OPTIONS
from .utils import Default, ReprObject, _check_inplace, _default, either_dict_or_kwargs
Expand Down Expand Up @@ -415,13 +415,13 @@ def _replace_maybe_drop_dims(
changed_dims = [
k for k in variable.dims if variable.sizes[k] != self.sizes[k]
]
indexes = copy_indexes(self._indexes, exclude=changed_dims)
indexes = propagate_indexes(self._indexes, exclude=changed_dims)
else:
allowed_dims = set(variable.dims)
coords = {
k: v for k, v in self._coords.items() if set(v.dims) <= allowed_dims
}
indexes = copy_indexes(
indexes = propagate_indexes(
self._indexes, exclude=(set(self.dims) - allowed_dims)
)
return self._replace(variable, coords, name, indexes=indexes)
Expand Down Expand Up @@ -464,7 +464,7 @@ def subset(dim, label):

variables = {label: subset(dim, label) for label in self.get_index(dim)}
variables.update({k: v for k, v in self._coords.items() if k != dim})
indexes = copy_indexes(self._indexes, exclude=dim)
indexes = propagate_indexes(self._indexes, exclude=dim)
coord_names = set(self._coords) - set([dim])
dataset = Dataset._from_vars_and_coord_names(
variables, coord_names, indexes=indexes, attrs=self.attrs
Expand Down
4 changes: 2 additions & 2 deletions xarray/core/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
from .duck_array_ops import datetime_to_numeric
from .indexes import (
Indexes,
copy_indexes,
default_indexes,
isel_variable_and_index,
propagate_indexes,
roll_index,
)
from .merge import (
Expand Down Expand Up @@ -4357,7 +4357,7 @@ def to_array(self, dim="variable", name=None):

coords = dict(self.coords)
coords[dim] = list(self.data_vars)
indexes = copy_indexes(self._indexes)
indexes = propagate_indexes(self._indexes)

dims = (dim,) + broadcast_vars[0].dims

Expand Down
4 changes: 2 additions & 2 deletions xarray/core/groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .common import ImplementsArrayReduce, ImplementsDatasetReduce
from .concat import concat
from .formatting import format_array_flat
from .indexes import copy_indexes
from .indexes import propagate_indexes
from .options import _get_keep_attrs
from .pycompat import integer_types
from .utils import (
Expand Down Expand Up @@ -530,7 +530,7 @@ def _maybe_unstack(self, obj):
for dim in self._inserted_dims:
if dim in obj.coords:
del obj.coords[dim]
obj._indexes = copy_indexes(obj._indexes, exclude=self._inserted_dims)
obj._indexes = propagate_indexes(obj._indexes, exclude=self._inserted_dims)
return obj

def fillna(self, value):
Expand Down
2 changes: 1 addition & 1 deletion xarray/core/indexes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def roll_index(index: pd.Index, count: int, axis: int = 0) -> pd.Index:
return index[:]


def copy_indexes(
def propagate_indexes(
indexes: Optional[Dict[Hashable, pd.Index]], exclude: Optional[Any] = None
) -> Optional[Dict[Hashable, pd.Index]]:
""" Creates new indexes dict from existing dict optionally excluding some dimensions.
Expand Down
0