#203 Merge pull request from astropenguin/astropenguin/issue202

Fix import of Literal and Protocol

Author: astropenguin

tests/test_data.py

@@ -1,11 +1,11 @@
 # standard library
 from dataclasses import dataclass
-from typing import Collection, Tuple, Union
+from typing import Collection, Literal as L, Tuple, Union
 
 
 # dependencies
 import numpy as np
-from typing_extensions import Annotated as Ann, Literal as L
+from typing_extensions import Annotated as Ann
 from xarray_dataclasses.typing import Attr, Coord, Coordof, Data
 
 

tests/test_dataarray.py

@@ -1,12 +1,11 @@
 # standard library
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Literal, Tuple
 
 
 # dependencies
 import numpy as np
 import xarray as xr
-from typing_extensions import Literal
 
 
 # submodules

tests/test_datamodel.py

@@ -1,10 +1,6 @@
 # standard library
 from dataclasses import dataclass
-from typing import Tuple
-
-
-# dependencies
-from typing_extensions import Literal
+from typing import Literal, Tuple
 
 
 # submodules

tests/test_dataset.py

@@ -1,12 +1,11 @@
 # standard library
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Literal, Tuple
 
 
 # dependencies
 import numpy as np
 import xarray as xr
-from typing_extensions import Literal
 
 
 # submodules

tests/test_typing.py

@@ -1,12 +1,11 @@
 # standard library
-from typing import Any, Tuple, Union
+from typing import Any, Literal as L, Tuple, Union
 
 
 # dependencies
 import numpy as np
 from pytest import mark
 from typing_extensions import Annotated as Ann
-from typing_extensions import Literal as L
 
 
 # submodules

xarray_dataclasses/datamodel.py

@@ -4,13 +4,24 @@
 
 # standard library
 from dataclasses import dataclass, field, is_dataclass
-from typing import Any, Dict, Hashable, List, Optional, Tuple, Type, Union, cast
+from typing import (
+    Any,
+    Dict,
+    Hashable,
+    List,
+    Literal,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+    cast,
+)
 
 
 # dependencies
 import numpy as np
 import xarray as xr
-from typing_extensions import Literal, ParamSpec, get_type_hints
+from typing_extensions import ParamSpec, get_type_hints
 
 
 # submodules

xarray_dataclasses/typing.py

@@ -29,7 +29,9 @@
     Generic,
     Hashable,
     Iterable,
+    Literal,
     Optional,
+    Protocol,
     Sequence,
     Tuple,
     Type,
@@ -43,9 +45,7 @@
 import xarray as xr
 from typing_extensions import (
     Annotated,
-    Literal,
     ParamSpec,
-    Protocol,
     TypeAlias,
     get_args,
     get_origin,