#157 Update OptionedClass

Author: astropenguin

xarray_dataclasses/dataarray.py

@@ -5,17 +5,7 @@
 # standard library
 from functools import partial, wraps
 from types import MethodType
-from typing import (
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    Optional,
-    Type,
-    TypeVar,
-    Union,
-    overload,
-)
+from typing import Any, Callable, Optional, Type, TypeVar, Union, overload
 
 
 # dependencies
@@ -28,21 +18,17 @@
 # submodules
 from .datamodel import DataModel
 from .dataoptions import DataOptions
-from .typing import AnyArray, AnyField, AnyXarray, DataClass, Order, Shape, Sizes
+from .typing import AnyArray, AnyXarray, DataClass, Order, Shape, Sizes
 
 
 # type hints
 PInit = ParamSpec("PInit")
 TDataArray = TypeVar("TDataArray", bound=xr.DataArray)
 
 
-class OptionedClass(Protocol[PInit, TDataArray]):
+class OptionedClass(DataClass[PInit], Protocol[PInit, TDataArray]):
     """Type hint for dataclass objects with options."""
 
-    def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None:
-        ...
-
-    __dataclass_fields__: ClassVar[Dict[str, AnyField]]
     __dataoptions__: DataOptions[TDataArray]
 
 

xarray_dataclasses/dataset.py

@@ -5,7 +5,7 @@
 # standard library
 from functools import partial, wraps
 from types import MethodType
-from typing import Any, Callable, ClassVar, Dict, Optional, Type, TypeVar, overload
+from typing import Any, Callable, Dict, Optional, Type, TypeVar, overload
 
 
 # dependencies
@@ -18,21 +18,17 @@
 # submodules
 from .datamodel import DataModel
 from .dataoptions import DataOptions
-from .typing import AnyArray, AnyField, AnyXarray, DataClass, Order, Shape, Sizes
+from .typing import AnyArray, AnyXarray, DataClass, Order, Shape, Sizes
 
 
 # type hints
 PInit = ParamSpec("PInit")
 TDataset = TypeVar("TDataset", bound=xr.Dataset)
 
 
-class OptionedClass(Protocol[PInit, TDataset]):
+class OptionedClass(DataClass[PInit], Protocol[PInit, TDataset]):
     """Type hint for dataclass objects with options."""
 
-    def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None:
-        ...
-
-    __dataclass_fields__: ClassVar[Dict[str, AnyField]]
     __dataoptions__: DataOptions[TDataset]