#157 Remove DataClassFields

Author: astropenguin

xarray_dataclasses/dataarray.py

@@ -9,6 +9,7 @@
     Any,
     Callable,
     ClassVar,
+    Dict,
     Optional,
     Type,
     TypeVar,
@@ -27,7 +28,7 @@
 # submodules
 from .datamodel import DataModel
 from .dataoptions import DataOptions
-from .typing import AnyArray, DataClass, DataClassFields, DataType, Order, Shape, Sizes
+from .typing import AnyArray, AnyField, DataClass, DataType, Order, Shape, Sizes
 
 
 # type hints
@@ -41,7 +42,7 @@ class OptionedClass(Protocol[PInit, TDataArray]):
     def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None:
         ...
 
-    __dataclass_fields__: ClassVar[DataClassFields]
+    __dataclass_fields__: ClassVar[Dict[str, AnyField]]
     __dataoptions__: DataOptions[TDataArray]
 
 

xarray_dataclasses/dataset.py

@@ -18,7 +18,7 @@
 # submodules
 from .datamodel import DataModel
 from .dataoptions import DataOptions
-from .typing import AnyArray, DataClass, DataClassFields, DataType, Order, Shape, Sizes
+from .typing import AnyArray, AnyField, DataClass, DataType, Order, Shape, Sizes
 
 
 # type hints
@@ -32,7 +32,7 @@ class OptionedClass(Protocol[PInit, TDataset]):
     def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None:
         ...
 
-    __dataclass_fields__: ClassVar[DataClassFields]
+    __dataclass_fields__: ClassVar[Dict[str, AnyField]]
     __dataoptions__: DataOptions[TDataset]
 
 

xarray_dataclasses/typing.py

@@ -64,7 +64,6 @@
 AnyArray: TypeAlias = "np.ndarray[Any, Any]"
 AnyDType: TypeAlias = "np.dtype[Any]"
 AnyField: TypeAlias = "Field[Any]"
-DataClassFields = Dict[str, AnyField]
 DataType = Union[xr.DataArray, xr.Dataset]
 Dims = Tuple[str, ...]
 Dtype = Optional[str]
@@ -79,7 +78,7 @@ class DataClass(Protocol[PInit]):
     def __init__(self, *args: PInit.args, **kwargs: PInit.kwargs) -> None:
         ...
 
-    __dataclass_fields__: ClassVar[DataClassFields]
+    __dataclass_fields__: ClassVar[Dict[str, AnyField]]
 
 
 class Labeled(Generic[TDims]):