From 1cd9c7d669adc306181008d1491bc52dd92a690d Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 16 Jul 2022 16:07:39 +0200 Subject: [PATCH] Fixed set-version --- tools/set_version/__init__.py | 4 ++-- tools/set_version/set-version.json | 2 +- tools/set_version/version_setter_service.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/set_version/__init__.py b/tools/set_version/__init__.py index 1601ae03..ef7b39f6 100644 --- a/tools/set_version/__init__.py +++ b/tools/set_version/__init__.py @@ -15,7 +15,7 @@ __title__ = 'set_version' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '2022.6.0' +__version__ = '2022.7.0' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='6', micro='0') +version_info = VersionInfo(major='2022', minor='7', micro='0') diff --git a/tools/set_version/set-version.json b/tools/set_version/set-version.json index 2e999483..436efd5f 100644 --- a/tools/set_version/set-version.json +++ b/tools/set_version/set-version.json @@ -3,7 +3,7 @@ "Name": "set-version", "Version": { "Major": "2022", - "Minor": "6", + "Minor": "7", "Micro": "0" }, "Author": "Sven Heidemann", diff --git a/tools/set_version/version_setter_service.py b/tools/set_version/version_setter_service.py index 31786269..f9abfdae 100644 --- a/tools/set_version/version_setter_service.py +++ b/tools/set_version/version_setter_service.py @@ -50,9 +50,10 @@ class VersionSetterService: if dep_name[len(dep_name)-1] not in ascii_letters: dep_name = dep_name[:len(dep_name)-1] - if skipped is not None and (dep_name in skipped or String.convert_to_snake_case(dep_name) in skipped): + if skipped is not None and (dep_name in skipped or String.convert_to_snake_case(dep_name) in skipped) or dep_version == '': new_deps.append(dependency) continue + new_deps.append(dependency.replace(dep_version, f'{version["Major"]}.{version["Minor"]}.{version["Micro"]}')) project_json['ProjectSettings'][key] = new_deps