Don't re-export common.typing, install typing_extensions for all Python versions

Author: danielhollas

pyproject.toml

@@ -57,7 +57,7 @@ dependencies = [
   'sqlalchemy>=2.0.20,<3',
   'tabulate>=0.9.0,<0.10.0',
   'tqdm~=4.45',
-  'typing-extensions~=4.1;python_version<"3.11"',
+  'typing-extensions~=4.1',
   'upf_to_json~=0.9.2',
   'wrapt~=1.11',
   'chardet~=5.2.0;platform_system=="Windows"'

src/aiida/common/extendeddicts.py

@@ -13,7 +13,7 @@
 from collections.abc import KeysView, Mapping
 from typing import Any
 
-from aiida.common.typing import Self
+from typing_extensions import Self
 
 from . import exceptions
 

src/aiida/common/folders.py

@@ -20,9 +20,11 @@
 import typing as t
 from collections.abc import Iterator
 
+from typing_extensions import Self
+
 from . import timezone
 from .lang import type_check
-from .typing import FilePath, Self
+from .typing import FilePath
 
 # If True, tries to make everything (dirs, files) group-writable.
 # Otherwise, tries to make everything only readable and writable by the user.

src/aiida/common/typing.py

@@ -11,14 +11,6 @@
 from __future__ import annotations
 
 import pathlib
-import sys
 from typing import Union
 
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
-
-__all__ = ('FilePath', 'Self')
-
 FilePath = Union[str, pathlib.PurePath]

src/aiida/common/utils.py

@@ -21,7 +21,7 @@
 from typing import Any, Callable, TypeVar, overload
 from uuid import UUID
 
-from aiida.common.typing import Self
+from typing_extensions import Self
 
 from .lang import classproperty
 

src/aiida/engine/daemon/execmanager.py

@@ -23,11 +23,8 @@
 from typing import TYPE_CHECKING, Any, List, Optional, Tuple, Union
 from typing import Mapping as MappingType
 
-try:
-    # typing.assert_never available since 3.11
-    from typing import assert_never
-except ImportError:
-    from typing_extensions import assert_never
+# typing.assert_never available since 3.11
+from typing_extensions import assert_never
 
 from aiida.common import AIIDA_LOGGER, exceptions
 from aiida.common.datastructures import CalcInfo, FileCopyOperation

src/aiida/engine/processes/functions.py

@@ -49,11 +49,8 @@
     # This type is not available for Python 3.9 and older
     UnionType = None  # type: ignore[assignment,misc]
 
-try:
-    from typing import ParamSpec
-except ImportError:
-    # Fallback for Python 3.9 and older
-    from typing_extensions import ParamSpec  # type: ignore[assignment]
+# Fallback for Python 3.9 and older
+from typing_extensions import ParamSpec
 
 try:
     get_annotations = inspect.get_annotations

src/aiida/orm/entities.py

@@ -19,12 +19,12 @@
 from plumpy.base.utils import call_with_super_check, super_check
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
+from typing_extensions import Self
 
 from aiida.common import exceptions, log
 from aiida.common.exceptions import EntryPointError, InvalidOperation, NotExistent
 from aiida.common.lang import classproperty, type_check
 from aiida.common.pydantic import MetadataField, get_metadata
-from aiida.common.typing import Self
 from aiida.common.warnings import warn_deprecation
 from aiida.manage import get_manager
 

src/aiida/orm/groups.py

@@ -14,10 +14,11 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional, Sequence, Tuple, Type, Union, cast
 
+from typing_extensions import Self
+
 from aiida.common import exceptions
 from aiida.common.lang import classproperty, type_check
 from aiida.common.pydantic import MetadataField
-from aiida.common.typing import Self
 from aiida.common.warnings import warn_deprecation
 from aiida.manage import get_manager
 

src/aiida/orm/nodes/node.py

@@ -16,12 +16,13 @@
 from typing import TYPE_CHECKING, Any, ClassVar, Dict, Generic, Iterator, List, NoReturn, Optional, Tuple, Type, TypeVar
 from uuid import UUID
 
+from typing_extensions import Self
+
 from aiida.common import exceptions
 from aiida.common.lang import classproperty, type_check
 from aiida.common.links import LinkType
 from aiida.common.log import AIIDA_LOGGER
 from aiida.common.pydantic import MetadataField
-from aiida.common.typing import Self
 from aiida.common.warnings import warn_deprecation
 from aiida.manage import get_manager
 from aiida.orm.utils.node import (