sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Improved version handling

Browse Source
This commit is contained in:
Sven Heidemann 2021-04-07 18:35:14 +02:00
parent d9bd7911ef
commit 703d20f43f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cpl_cli/configuration/version_settings.py
View File

@ -31,16 +31,25 @@ class VersionSettings(ConfigurationModelABC):
return self._micro return self._micro
def to_str(self) -> str: def to_str(self) -> str:
return f'{self._major}.{self._minor}.{self._micro}' if self._micro is None:
return f'{self._major}.{self._minor}'
else:
return f'{self._major}.{self._minor}.{self._micro}'
def from_dict(self, settings: dict): def from_dict(self, settings: dict):
self._major = settings[VersionSettingsNameEnum.major.value] self._major = settings[VersionSettingsNameEnum.major.value]
self._minor = settings[VersionSettingsNameEnum.minor.value] self._minor = settings[VersionSettingsNameEnum.minor.value]
self._micro = settings[VersionSettingsNameEnum.micro.value] micro = settings[VersionSettingsNameEnum.micro.value]
if micro != '':
self._micro = micro
def to_dict(self) -> dict: def to_dict(self) -> dict:
return { version = {
VersionSettingsNameEnum.major.value: self._major, VersionSettingsNameEnum.major.value: self._major,
VersionSettingsNameEnum.minor.value: self._minor, VersionSettingsNameEnum.minor.value: self._minor,
VersionSettingsNameEnum.micro.value: self._micro
} }
if self._micro is not None:
version[VersionSettingsNameEnum.micro.value] = self._micro
return version