From 1ba7f01b934cda774a05bd2295020ecad2e25815 Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 14 Apr 2023 12:04:10 +0200 Subject: [PATCH] Added some todos and extended mypy ci-pipeline --- .gitlab-ci.yml | 1 + src/main/python/ddadevops/release_mixin/infrastructure_api.py | 2 +- src/main/python/ddadevops/release_mixin/services.py | 2 ++ src/test/python/release_mixin/test_infrastructure_api.py | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5ed53a..22751b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ mypy: script: - pip install -r dev_requirements.txt - python -m mypy src/main/python/ddadevops/*.py --ignore-missing-imports + - python -m mypy src/main/python/ddadevops/*/*.py --ignore-missing-imports pylint: stage: lint&test diff --git a/src/main/python/ddadevops/release_mixin/infrastructure_api.py b/src/main/python/ddadevops/release_mixin/infrastructure_api.py index b09fd89..9c524a7 100644 --- a/src/main/python/ddadevops/release_mixin/infrastructure_api.py +++ b/src/main/python/ddadevops/release_mixin/infrastructure_api.py @@ -22,7 +22,7 @@ class FileHandler(ABC): case _: raise Exception( f'The file type "{config_file_type}" is not implemented') - + # TODO: Attribute is only set in classmethod. Should this be initialized outside of this class? file_handler.config_file_path = file_path file_handler.config_file_type = config_file_type return file_handler diff --git a/src/main/python/ddadevops/release_mixin/services.py b/src/main/python/ddadevops/release_mixin/services.py index 11a2433..b75de96 100644 --- a/src/main/python/ddadevops/release_mixin/services.py +++ b/src/main/python/ddadevops/release_mixin/services.py @@ -10,6 +10,7 @@ class PrepareReleaseService(): self.git_api = GitApi() def __write_and_commit_version(self, version: Version, commit_message: str): + # TODO: isValid is missing self.release.validate(self.release_repo.main_branch) self.release_repo.version_repository.write_file(version.get_version_string()) @@ -30,6 +31,7 @@ class TagAndPushReleaseService(): def tag_release(self, release: Release): annotation = 'v' + release.version.get_version_string() message = 'Release ' + annotation + # TODO: Why is the count a parameter? We always tag the second last commit in this process. self.git_api.tag_annotated(annotation, message, 1) def push_release(self): diff --git a/src/test/python/release_mixin/test_infrastructure_api.py b/src/test/python/release_mixin/test_infrastructure_api.py index c218833..0379d89 100644 --- a/src/test/python/release_mixin/test_infrastructure_api.py +++ b/src/test/python/release_mixin/test_infrastructure_api.py @@ -1,7 +1,7 @@ from pathlib import Path import pytest as pt -from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi, EnvironmentApi +from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi, EnvironmentApi, JsonFileHandler from src.main.python.ddadevops.release_mixin.infrastructure import VersionRepository from src.main.python.ddadevops.release_mixin.domain import ReleaseType @@ -100,4 +100,4 @@ def test_python(tmp_path): repo.write_file(version.get_version_string()) # check - assert '3.1.3-SNAPSHOT' in th.TEST_FILE_PATH.read_text() \ No newline at end of file + assert '3.1.3-SNAPSHOT' in th.TEST_FILE_PATH.read_text()