From b5633cf3253786e6493f460402bb78e00c0f870b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Thu, 18 Jan 2024 15:04:18 +0100 Subject: [PATCH 1/2] Fix: Fix return type of `CMakeVErsionParser._tokenize` method The method is just an iterator. --- pontos/version/commands/_cmake.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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}") From afb33b5d49026920d2d790a154ccb069c8d1f1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Thu, 18 Jan 2024 15:06:20 +0100 Subject: [PATCH 2/2] Fix: Fix `versioning_scheme` type of `Project` constructor `versioning_scheme` might be an instance of `VersioningScheme` but most of the time the class is passed instead. --- pontos/version/project.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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