Python version safed import of TypeAlias

extras/fileformats/extras/application/archive.py

@@ -10,7 +10,7 @@
 import pydra.engine.specs
 from fileformats.generic import FsObject
 from fileformats.core.utils import set_cwd
-from fileformats.core.type_aliases import PathType
+from fileformats.core.typing import PathType
 from fileformats.core import converter, FileSet
 from fileformats.application import Zip, Tar, TarGzip
 
@@ -238,4 +238,4 @@ def relative_path(path: PathType, base_dir: PathType) -> str:
             f"Cannot add {path} to archive as it is not a "
             f"subdirectory of {base_dir}"
         )
-    return relpath
+    return relpath  # type: ignore[no-any-return]

extras/fileformats/extras/application/serialization.py

@@ -24,7 +24,7 @@ def convert_data_serialization(
     output_path = out_dir / (
         in_file.fspath.stem + (output_format.ext if output_format.ext else "")
     )
-    return output_format.save_new(output_path, dct)
+    return output_format.save_new(output_path, dct)  # type: ignore[no-any-return]
 
 
 @extra_implementation(DataSerialization.load)

extras/fileformats/extras/image/converters.py

@@ -25,4 +25,4 @@ def convert_image(
     output_path = out_dir / (
         in_file.fspath.stem + (output_format.ext if output_format.ext else "")
     )
-    return output_format.save_new(output_path, data_array)
+    return output_format.save_new(output_path, data_array)  # type: ignore[no-any-return]

fileformats/application/serialization.py

@@ -1,6 +1,6 @@
 import json
 import typing as ty
-from typing_extensions import Self, TypeAlias
+from fileformats.core.typing import Self, TypeAlias
 from pathlib import Path
 from fileformats.core import extra, DataType, FileSet, extra_implementation
 from fileformats.core.mixin import WithClassifiers

fileformats/core/datatype.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from inspect import isclass
 import typing as ty
-from typing_extensions import Self
+from fileformats.core.typing import Self
 from abc import ABCMeta
 import importlib
 import itertools
@@ -27,7 +27,7 @@
 class DataType(Classifier, metaclass=ABCMeta):
     is_fileset = False
     is_field = False
-    nested_types: ty.Tuple[ty.Type["DataType"], ...] = ()
+    nested_types: ty.Tuple[ty.Type[Classifier], ...] = ()
     # Store converters registered by @converter decorator that convert to FileSet
     # NB: each class will have its own version of this dictionary
     converters: ty.Dict[

fileformats/core/extras.py

@@ -5,7 +5,7 @@
 import functools
 import urllib.error
 import fileformats.core
-from typing_extensions import TypeAlias
+from fileformats.core.typing import TypeAlias
 from .datatype import DataType
 from .converter_helpers import ConverterWrapper, ConverterSpec, SubtypeVar
 from .exceptions import FormatConversionError, FileFormatsExtrasError

fileformats/core/fileset.py

@@ -14,15 +14,15 @@
 from pathlib import Path
 import hashlib
 import logging
-from typing_extensions import Self
+from fileformats.core.typing import Self
 from .utils import (
     classproperty,
     fspaths_converter,
     describe_task,
     matching_source,
     import_extras_module,
 )
-from .type_aliases import FspathsInputType, CryptoMethod, PathType
+from .typing import FspathsInputType, CryptoMethod, PathType
 from .sampling import SampleFileGenerator
 from .identification import (
     to_mime_format_name,

fileformats/core/mixin.py

@@ -175,7 +175,7 @@ class MyFileFormatWithSeparateHeader(WithSeparateHeader, MyFileFormat):
     header_type: ty.Type["fileformats.core.FileSet"]
 
     @classproperty
-    def nested_types(cls) -> ty.Tuple[ty.Type["DataType"], ...]:
+    def nested_types(cls) -> ty.Tuple[ty.Type[Classifier], ...]:
         return (cls.header_type,)
 
     @property
@@ -235,7 +235,7 @@ def read_metadata(
         return metadata
 
     @classproperty
-    def nested_types(cls) -> ty.Tuple[ty.Type["DataType"], ...]:
+    def nested_types(cls) -> ty.Tuple[ty.Type[Classifier], ...]:
         return cls.side_car_types
 
 
@@ -316,7 +316,7 @@ def is_classified(cls) -> bool:
         return "unclassified" in cls.__dict__
 
     @classproperty
-    def nested_types(cls) -> ty.Tuple[ty.Type["DataType"], ...]:
+    def nested_types(cls) -> ty.Tuple[ty.Type[Classifier], ...]:
         return cls.classifiers
 
     @classmethod

fileformats/core/type_aliases.py → fileformats/core/typing.py

@@ -1,6 +1,11 @@
 import typing as ty
+import sys
 from pathlib import Path
-from typing_extensions import TypeAlias
+
+if sys.version_info[:2] < (3, 11):
+    from typing_extensions import TypeAlias, Self
+else:
+    from typing import TypeAlias, Self
 
 if ty.TYPE_CHECKING:
     import fileformats.core
@@ -15,3 +20,6 @@
 ]
 
 PathType: TypeAlias = ty.Union[str, Path]
+
+
+__all__ = ["CryptoMethod", "FspathsInputType", "PathType", "TypeAlias", "Self"]

fileformats/core/utils.py

@@ -10,7 +10,7 @@
 import logging
 import pkgutil
 from contextlib import contextmanager
-from .type_aliases import FspathsInputType
+from .typing import FspathsInputType
 import fileformats.core
 
 if ty.TYPE_CHECKING:

fileformats/generic/directory.py

@@ -5,7 +5,7 @@
 from .fsobject import FsObject
 from fileformats.core.fileset import FileSet, FILE_CHUNK_LEN_DEFAULT
 from fileformats.core.mixin import WithClassifiers
-from fileformats.core.type_aliases import CryptoMethod
+from fileformats.core.typing import CryptoMethod
 
 
 class Directory(FsObject):

fileformats/generic/file.py

@@ -125,7 +125,7 @@ def actual_ext(self) -> str:
                 "(i.e. matches the None extension)"
             )
         # Return the longest matching extension, useful for optional extensions
-        return sorted(matching, key=len)[-1]
+        return sorted(matching, key=len)[-1]  # type: ignore[no-any-return]
 
     @property
     def stem(self) -> str:

fileformats/image/raster.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing_extensions import Self, TypeAlias
+from fileformats.core.typing import Self, TypeAlias
 import typing as ty
 from fileformats.core.mixin import WithMagicNumber
 from fileformats.core import extra