diff --git a/pontos/version/commands/_cmake.py b/pontos/version/commands/_cmake.py index f06d36a45..154940383 100644 --- a/pontos/version/commands/_cmake.py +++ b/pontos/version/commands/_cmake.py @@ -5,7 +5,7 @@ import re -from typing import Generator, Literal, Optional, Tuple, Union +from typing import Iterator, Literal, Optional, Tuple, Union from .._errors import VersionError from .._version import Version, VersionUpdate @@ -189,11 +189,7 @@ def is_dev_version(self) -> bool: def _tokenize( # type: ignore self, content: str - ) -> Generator[ - Tuple[int, str, str], - Tuple[int, str, str], - Tuple[int, str, str], - ]: + ) -> Iterator[Tuple[int, str, str]]: toks, remainder = self.__cmake_scanner.scan(content) if remainder != "": print(f"WARNING: unrecognized cmake tokens: {remainder}") diff --git a/pontos/version/project.py b/pontos/version/project.py index ad93fbb5f..1e9dce404 100644 --- a/pontos/version/project.py +++ b/pontos/version/project.py @@ -4,7 +4,7 @@ # -from typing import List, Literal, Union +from typing import List, Literal, Type, Union from ._errors import ProjectError from ._version import Version, VersionUpdate @@ -27,7 +27,9 @@ class Project: project = Project(PEP440VersioningScheme) """ - def __init__(self, versioning_scheme: VersioningScheme) -> None: + def __init__( + self, versioning_scheme: Union[VersioningScheme, Type[VersioningScheme]] + ) -> None: """ Creates a new project instance