From 6fa34975663a66bec560c9a250782ba9473c9ea0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:25:36 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- README.md | 2 +- datatree/__init__.py | 15 ++++++++------- datatree/datatree.py | 3 +-- datatree/formatting_html.py | 8 +++++--- datatree/iterators.py | 3 +-- datatree/tests/test_datatree.py | 6 ++---- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index cd0b0f04..bf400e4f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ that was more flexible than a single `xarray.Dataset` object. The initial motivation was to represent netCDF files / Zarr stores with multiple nested groups in a single in-memory object, but `datatree.DataTree` objects have many other uses. -# :rotating_light: :bell: :warning: NO LONGER MAINTAINED :warning: :bell: :rotating_light: +# :rotating_light: :bell: :warning: NO LONGER MAINTAINED :warning: :bell: :rotating_light: **This repository has been archived and the code is no longer maintained!** diff --git a/datatree/__init__.py b/datatree/__init__.py index 70f1c2f1..437339d1 100644 --- a/datatree/__init__.py +++ b/datatree/__init__.py @@ -1,12 +1,5 @@ import warnings -warnings.warn( - "The repository `xarray-contrib/datatree` has been archived! It is no longer maintained as of October 2024. " \ - "Datatree functionality has been migrated upstream to `pydata/xarray`, so please use `xarray.DataTree` instead. " \ - "To help you migrate there is a guide at https://github.com/pydata/xarray/blob/main/DATATREE_MIGRATION_GUIDE.md", - DeprecationWarning, -) - # import public API from .datatree import DataTree from .extensions import register_datatree_accessor @@ -14,6 +7,14 @@ from .mapping import TreeIsomorphismError, map_over_subtree from .treenode import InvalidTreeError, NotFoundInTreeError +warnings.warn( + "The repository `xarray-contrib/datatree` has been archived! It is no longer maintained as of October 2024. " + "Datatree functionality has been migrated upstream to `pydata/xarray`, so please use `xarray.DataTree` instead. " + "To help you migrate there is a guide at https://github.com/pydata/xarray/blob/main/DATATREE_MIGRATION_GUIDE.md", + DeprecationWarning, +) + + try: # NOTE: the `_version.py` file must not be present in the git repository # as it is generated by setuptools at install time diff --git a/datatree/datatree.py b/datatree/datatree.py index c86c2e2e..b29a3da5 100644 --- a/datatree/datatree.py +++ b/datatree/datatree.py @@ -177,8 +177,7 @@ def __getitem__(self, key: Hashable) -> DataArray: # type: ignore[misc] ... @overload - def __getitem__(self, key: Any) -> Dataset: - ... + def __getitem__(self, key: Any) -> Dataset: ... def __getitem__(self, key) -> DataArray: # TODO call the `_get_item` method of DataTree to allow path-like access to contents of other nodes diff --git a/datatree/formatting_html.py b/datatree/formatting_html.py index 4531f5ae..bebfa27c 100644 --- a/datatree/formatting_html.py +++ b/datatree/formatting_html.py @@ -22,9 +22,11 @@ def summarize_children(children: Mapping[str, Any]) -> str: lines_callback = lambda n, c, end: _wrap_repr(node_repr(n, c), end=end) children_html = "".join( - lines_callback(n, c, end=False) # Long lines - if i < N_CHILDREN - else lines_callback(n, c, end=True) # Short lines + ( + lines_callback(n, c, end=False) # Long lines + if i < N_CHILDREN + else lines_callback(n, c, end=True) + ) # Short lines for i, (n, c) in enumerate(children.items()) ) diff --git a/datatree/iterators.py b/datatree/iterators.py index 52ed8d22..a13dba95 100644 --- a/datatree/iterators.py +++ b/datatree/iterators.py @@ -60,8 +60,7 @@ def __next__(self) -> Iterator[Tree]: @staticmethod @abstractmethod - def _iter(children: List[Tree], filter_, stop, maxlevel) -> Iterator[Tree]: - ... + def _iter(children: List[Tree], filter_, stop, maxlevel) -> Iterator[Tree]: ... @staticmethod def _abort_at_level(level, maxlevel): diff --git a/datatree/tests/test_datatree.py b/datatree/tests/test_datatree.py index e9f373d7..9e6215a7 100644 --- a/datatree/tests/test_datatree.py +++ b/datatree/tests/test_datatree.py @@ -166,8 +166,7 @@ def test_assign_when_already_child_with_variables_name(self): dt.ds = new_ds -class TestGet: - ... +class TestGet: ... class TestGetItem: @@ -450,8 +449,7 @@ def test_setitem_dataarray_replace_existing_node(self): xrt.assert_identical(results.to_dataset(), expected) -class TestDictionaryInterface: - ... +class TestDictionaryInterface: ... class TestTreeFromDict: