Skip to content

Commit 18e5c87

Browse files
owenlittlejohnsflamingbeareni-awowaleshoyer
authored
DAS-2155 - Merge datatree documentation into main docs. (#9033)
Co-authored-by: Matt Savoie <[email protected]> Co-authored-by: Eni <[email protected]> Co-authored-by: Stephan Hoyer <[email protected]> Co-authored-by: Matt Savoie <[email protected]>
1 parent 8bd456c commit 18e5c87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1052
-3305
lines changed

.github/workflows/ci-additional.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ jobs:
8181
#
8282
# If dependencies emit warnings we can't do anything about, add ignores to
8383
# `xarray/tests/__init__.py`.
84-
# [MHS, 01/25/2024] Skip datatree_ documentation remove after #8572
85-
python -m pytest --doctest-modules xarray --ignore xarray/tests --ignore xarray/datatree_ -Werror
84+
python -m pytest --doctest-modules xarray --ignore xarray/tests -Werror
8685
8786
mypy:
8887
name: Mypy

.pre-commit-config.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
ci:
33
autoupdate_schedule: monthly
44
autoupdate_commit_msg: 'Update pre-commit hooks'
5-
exclude: 'xarray/datatree_.*'
65
repos:
76
- repo: https://github.com/pre-commit/pre-commit-hooks
87
rev: v4.6.0

MANIFEST.in

-2
This file was deleted.

asv_bench/benchmarks/dataset_io.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import pandas as pd
88

99
import xarray as xr
10-
from xarray.backends.api import open_datatree
11-
from xarray.core.datatree import DataTree
1210

1311
from . import _skip_slow, parameterized, randint, randn, requires_dask
1412

@@ -556,7 +554,7 @@ def make_datatree(self, nchildren=10):
556554
for group in range(self.nchildren)
557555
}
558556
dtree = root | nested_tree1 | nested_tree2 | nested_tree3
559-
self.dtree = DataTree.from_dict(dtree)
557+
self.dtree = xr.DataTree.from_dict(dtree)
560558

561559

562560
class IOReadDataTreeNetCDF4(IONestedDataTree):
@@ -574,10 +572,10 @@ def setup(self):
574572
dtree.to_netcdf(filepath=self.filepath)
575573

576574
def time_load_datatree_netcdf4(self):
577-
open_datatree(self.filepath, engine="netcdf4").load()
575+
xr.open_datatree(self.filepath, engine="netcdf4").load()
578576

579577
def time_open_datatree_netcdf4(self):
580-
open_datatree(self.filepath, engine="netcdf4")
578+
xr.open_datatree(self.filepath, engine="netcdf4")
581579

582580

583581
class IOWriteNetCDFDask:

ci/requirements/doc.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ dependencies:
3939
- sphinx-copybutton
4040
- sphinx-design
4141
- sphinx-inline-tabs
42-
- sphinx>=5.0
42+
- sphinx>=5.0,<7.0 # https://github.com/executablebooks/sphinx-book-theme/issues/749
43+
- sphinxcontrib-srclinks
4344
- sphinx-remove-toctrees
4445
- sphinxext-opengraph
4546
- sphinxext-rediraffe

0 commit comments

Comments
 (0)