Merge pull request #80 from evo-company/typings-compat

typings compatibility

hiku/compat.py

@@ -20,3 +20,23 @@ def arguments(_, args, vararg, kwonlyargs, kw_defaults, kwarg, defaults):  # typ
 
 
 ast = _AST()
+
+if sys.version_info >= (3, 10):
+    from typing import Concatenate, ParamSpec, TypeAlias
+else:
+    from typing_extensions import Concatenate, ParamSpec, TypeAlias
+
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+else:
+    from typing_extensions import Protocol
+
+__all__ = [
+    'PY38',
+    'PY310',
+    'ast',
+    'Protocol',
+    'Concatenate',
+    'ParamSpec',
+    'TypeAlias'
+]

hiku/engine.py

@@ -21,8 +21,8 @@
 from itertools import chain, repeat
 from collections import defaultdict
 from collections.abc import Sequence, Mapping, Hashable
-from typing_extensions import Concatenate, ParamSpec
 
+from .compat import Concatenate, ParamSpec
 from .executors.base import SyncAsyncExecutor
 from .query import (
     Node as QueryNode,

hiku/executors/queue.py

@@ -11,8 +11,7 @@
     Union,
 )
 
-from typing_extensions import Protocol
-
+from hiku.compat import Protocol
 from hiku.executors.base import BaseExecutor
 from hiku.result import Proxy
 

hiku/expr/core.py

@@ -10,8 +10,8 @@
 from functools import wraps
 from itertools import chain
 from collections import namedtuple
-from typing_extensions import ParamSpec
 
+from ..compat import ParamSpec
 from ..edn import loads
 from ..query import Node as QueryNode, Link, Field
 from ..types import (

hiku/graph.py

@@ -14,8 +14,6 @@
 from collections import OrderedDict
 from typing import List
 
-from typing_extensions import TypeAlias
-
 from .types import (
     Optional,
     OptionalMeta,
@@ -36,6 +34,9 @@
 )
 from .directives import DirectiveBase
 
+from .compat import TypeAlias
+
+
 if t.TYPE_CHECKING:
     from .sources.graph import SubGraph
     from .sources.graph import BoundExpr

hiku/introspection/types.py

@@ -5,7 +5,8 @@
     NamedTuple,
 )
 
-from typing_extensions import TypeAlias
+from hiku.compat import TypeAlias
+
 
 # Mark everything that _namedtuple creates as HashedNamedTuple,
 # so it will be easier to refactor types later

hiku/sources/graph.py

@@ -7,9 +7,8 @@
     Iterator,
 )
 
-from typing_extensions import TypeAlias
-
 from .. import query
+from ..compat import TypeAlias
 from ..executors.queue import (
     Queue,
     TaskSet,

hiku/utils.py

@@ -9,7 +9,7 @@
     Iterator,
 )
 
-from typing_extensions import ParamSpec
+from hiku.compat import ParamSpec
 
 Const = NewType('Const', object)