Skip to content
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

MNT: (deps): Bump xarray from 2023.8.0 to 2024.10.0 in /ci #800

Merged
merged 3 commits into from
Nov 6, 2024
Merged

MNT: (deps): Bump xarray from 2023.8.0 to 2024.10.0 in /ci #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46f1e29
MNT: (deps): Bump xarray from 0.20.2 to 2024.10.0 in /ci
dependabot[bot] Nov 6, 2024
1124d75
MNT: Update CDM xarray backend for newer xarray
dopplershift Nov 6, 2024
103c7da
CI: Remove pint pin
dopplershift Nov 6, 2024
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
1 change: 0 additions & 1 deletion ci/doc_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cartopy==0.22
matplotlib==3.9.2
metpy==1.6.3
pint==0.19
sphinx==5.2.3
sphinx_rtd_theme==1.0.0
sphinx-gallery==0.18.0
Expand Down
2 changes: 1 addition & 1 deletion ci/extra_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xarray==2023.8.0
xarray==2024.10.0
18 changes: 5 additions & 13 deletions src/siphon/cdmr/xarray_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
from xarray import Variable
from xarray.backends.common import AbstractDataStore, BackendArray
from xarray.core import indexing

try:
from xarray.core.utils import FrozenDict
except ImportError:
from xarray.core.utils import FrozenOrderedDict as FrozenDict
from xarray.core.utils import FrozenDict

from . import Dataset

Expand All @@ -33,15 +29,11 @@ def get_array(self):

def __getitem__(self, item):
"""Wrap getitem around the data."""
item, np_inds = indexing.decompose_indexer(item, self.shape,
indexing.IndexingSupport.BASIC)
with self.datastore:
array = self.get_array()[item.tuple]

if len(np_inds.tuple) > 0:
array = indexing.NumpyIndexingAdapter(array)[np_inds]

return array
arr = self.get_array()
return indexing.explicit_indexing_adapter(item, self.shape,
indexing.IndexingSupport.BASIC,
arr.__getitem__)


class CDMRemoteStore(AbstractDataStore):
Expand Down