Skip to content

Commit 7f99782

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent dc036a0 commit 7f99782

11 files changed

Lines changed: 25 additions & 54 deletions

File tree

‎src/xarray_dataclass/__init__.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
11
__all__ = [
22
"AsDataArray",
33
"AsDataset",
4-
"DataModel",
5-
"DataOptions",
64
"Attr",
75
"Coord",
86
"Coordof",
97
"Data",
8+
"DataModel",
9+
"DataOptions",
1010
"Dataof",
1111
"Name",
12+
"__version__",
1213
"asdataarray",
1314
"asdataset",
1415
"dataarray",
15-
"dataset",
1616
"datamodel",
1717
"dataoptions",
18+
"dataset",
1819
"typing",
19-
"__version__",
2020
]
2121

2222

2323
# submodules
24-
from . import dataarray
25-
from . import dataset
26-
from . import datamodel
27-
from . import dataoptions
28-
from . import typing
24+
from . import dataarray, datamodel, dataoptions, dataset, typing
2925
from .__about__ import __version__
3026
from .dataarray import AsDataArray, asdataarray
31-
from .dataset import AsDataset, asdataset
3227
from .datamodel import DataModel
3328
from .dataoptions import DataOptions
29+
from .dataset import AsDataset, asdataset
3430
from .typing import (
3531
Attr,
3632
Coord,

‎src/xarray_dataclass/dataarray.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@
99
from types import MethodType
1010
from typing import Any, Callable, Optional, Protocol, Type, TypeVar, Union, overload
1111

12-
1312
# dependencies
1413
import numpy as np
1514
import xarray as xr
1615
from typing_extensions import ParamSpec
1716

18-
1917
# submodules
2018
from .datamodel import DataModel
2119
from .dataoptions import DataOptions
2220
from .typing import AnyArray, AnyXarray, DataClass, Order, Shape, Sizes
2321

24-
2522
# type hints
2623
PInit = ParamSpec("PInit")
2724
TDataArray = TypeVar("TDataArray", bound=xr.DataArray)
@@ -143,8 +140,8 @@ def new(cls: Any) -> Any:
143140
def new(cls: Any, *args: Any, **kwargs: Any) -> Any:
144141
return asdataarray(cls(*args, **kwargs))
145142

146-
setattr(new, "__doc__", cls.__init__.__doc__)
147-
setattr(new, "__signature__", sig)
143+
new.__doc__ = cls.__init__.__doc__
144+
new.__signature__ = sig
148145
return MethodType(new, cls)
149146

150147
@overload

‎src/xarray_dataclass/datamodel.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,26 @@
44

55

66
# standard library
7+
from collections.abc import Hashable
78
from dataclasses import dataclass, field, is_dataclass
89
from typing import (
910
Any,
1011
Dict,
11-
get_type_hints,
12-
Hashable,
1312
List,
1413
Literal,
1514
Optional,
1615
Tuple,
1716
Type,
1817
Union,
1918
cast,
19+
get_type_hints,
2020
)
2121

22-
2322
# dependencies
2423
import numpy as np
2524
import xarray as xr
2625
from typing_extensions import ParamSpec
2726

28-
2927
# submodules
3028
from .typing import (
3129
AnyDType,
@@ -42,7 +40,6 @@
4240
get_role,
4341
)
4442

45-
4643
# type hints
4744
PInit = ParamSpec("PInit")
4845
AnyDataClass = Union[Type[DataClass[PInit]], DataClass[PInit]]

‎src/xarray_dataclass/dataoptions.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
from dataclasses import dataclass
88
from typing import Callable, Generic, TypeVar
99

10-
1110
# submodules
1211
from .typing import AnyXarray
1312

14-
1513
# type hints
1614
TAnyXarray = TypeVar("TAnyXarray", bound=AnyXarray)
1715

‎src/xarray_dataclass/dataset.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@
99
from types import MethodType
1010
from typing import Any, Callable, Dict, Optional, Protocol, Type, TypeVar, overload
1111

12-
1312
# dependencies
1413
import numpy as np
1514
import xarray as xr
1615
from typing_extensions import ParamSpec
1716

18-
1917
# submodules
2018
from .datamodel import DataModel
2119
from .dataoptions import DataOptions
2220
from .typing import AnyArray, AnyXarray, DataClass, Order, Shape, Sizes
2321

24-
2522
# type hints
2623
PInit = ParamSpec("PInit")
2724
TDataset = TypeVar("TDataset", bound=xr.Dataset)
@@ -143,8 +140,8 @@ def new(cls: Any) -> Any:
143140
def new(cls: Any, *args: Any, **kwargs: Any) -> Any:
144141
return asdataset(cls(*args, **kwargs))
145142

146-
setattr(new, "__doc__", cls.__init__.__doc__)
147-
setattr(new, "__signature__", sig)
143+
new.__doc__ = cls.__init__.__doc__
144+
new.__signature__ = sig
148145
return MethodType(new, cls)
149146

150147
@overload

‎src/xarray_dataclass/typing.py‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,33 @@
1919

2020

2121
# standard library
22+
from collections.abc import Collection, Hashable, Iterable, Sequence
2223
from dataclasses import Field, is_dataclass
2324
from enum import Enum
2425
from itertools import chain
2526
from typing import (
2627
Annotated,
2728
Any,
2829
ClassVar,
29-
Collection,
3030
Dict,
3131
Generic,
32-
get_args,
33-
get_origin,
34-
get_type_hints,
35-
Hashable,
36-
Iterable,
3732
Literal,
3833
Optional,
3934
Protocol,
40-
Sequence,
4135
Tuple,
4236
Type,
4337
TypeVar,
4438
Union,
39+
get_args,
40+
get_origin,
41+
get_type_hints,
4542
)
4643

47-
4844
# dependencies
4945
import numpy as np
5046
import xarray as xr
5147
from typing_extensions import ParamSpec, TypeAlias
5248

53-
5449
# type hints (private)
5550
PInit = ParamSpec("PInit")
5651
T = TypeVar("T")
@@ -80,8 +75,6 @@ def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None: ...
8075
class Labeled(Generic[TDims]):
8176
"""Type hint for labeled objects."""
8277

83-
pass
84-
8578

8679
# type hints (public)
8780
class Role(Enum):

‎tests/test_data.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# standard library
2+
from collections.abc import Collection
23
from dataclasses import dataclass
3-
from typing import Collection, Literal as L, Tuple, Union
4-
4+
from typing import Annotated as Ann
5+
from typing import Literal as L
6+
from typing import Tuple, Union
57

68
# dependencies
79
import numpy as np
8-
from typing_extensions import Annotated as Ann
9-
from xarray_dataclass.typing import Attr, Coord, Coordof, Data
1010

11+
from xarray_dataclass.typing import Attr, Coord, Coordof, Data
1112

1213
# type hints
1314
X = L["x"]

‎tests/test_dataarray.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
import xarray as xr
88
from typing_extensions import TypeAlias
99

10-
1110
# submodules
1211
from xarray_dataclass.dataarray import AsDataArray
1312
from xarray_dataclass.dataoptions import DataOptions
1413
from xarray_dataclass.typing import Attr, Coord, Data, Name
1514

16-
1715
# constants
1816
DIMS = "x", "y"
1917
SHAPE = 10, 10

‎tests/test_datamodel.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
from dataclasses import dataclass
33
from typing import Literal, Tuple
44

5-
65
# submodules
76
from xarray_dataclass.datamodel import DataModel
87
from xarray_dataclass.typing import Attr, Coord, Coordof, Data, Dataof
98

10-
119
# type hints
1210
X = Literal["x"]
1311
Y = Literal["y"]

‎tests/test_dataset.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
from dataclasses import dataclass
33
from typing import Literal, Tuple
44

5-
65
# dependencies
76
import numpy as np
87
import xarray as xr
98
from typing_extensions import TypeAlias
109

11-
1210
# submodules
1311
from xarray_dataclass.dataarray import AsDataArray
14-
from xarray_dataclass.dataset import AsDataset
1512
from xarray_dataclass.dataoptions import DataOptions
13+
from xarray_dataclass.dataset import AsDataset
1614
from xarray_dataclass.typing import Attr, Coord, Data
1715

1816
# constants

0 commit comments

Comments
 (0)