diff --git a/src/cpl_cli/configuration/version_settings.py b/src/cpl_cli/configuration/version_settings.py index 700451ee..3d64d71e 100644 --- a/src/cpl_cli/configuration/version_settings.py +++ b/src/cpl_cli/configuration/version_settings.py @@ -8,35 +8,35 @@ class VersionSettings(ConfigurationModelABC): def __init__( self, - major: int = None, - minor: int = None, - micro: float = None + major: str = None, + minor: str = None, + micro: str = None ): ConfigurationModelABC.__init__(self) - self._major: Optional[int] = major - self._minor: Optional[int] = minor - self._micro: Optional[int] = micro + self._major: Optional[str] = major + self._minor: Optional[str] = minor + self._micro: Optional[str] = micro @property - def major(self) -> int: + def major(self) -> str: return self._major @property - def minor(self) -> int: + def minor(self) -> str: return self._minor @property - def micro(self) -> float: + def micro(self) -> str: return self._micro def to_str(self) -> str: return f'{self._major}.{self._minor}.{self._micro}' def from_dict(self, settings: dict): - self._major = int(settings[VersionSettingsNameEnum.major.value]) - self._minor = int(settings[VersionSettingsNameEnum.minor.value]) - self._micro = int(settings[VersionSettingsNameEnum.micro.value]) + self._major = settings[VersionSettingsNameEnum.major.value] + self._minor = settings[VersionSettingsNameEnum.minor.value] + self._micro = settings[VersionSettingsNameEnum.micro.value] def to_dict(self) -> dict: return { diff --git a/src/cpl_cli/publish/publisher_service.py b/src/cpl_cli/publish/publisher_service.py index 3d95969d..a29a510a 100644 --- a/src/cpl_cli/publish/publisher_service.py +++ b/src/cpl_cli/publish/publisher_service.py @@ -235,7 +235,7 @@ class PublisherService(PublisherABC): return paths def _create_setup(self): - setup_file = os.path.join(self._output_path, 'setup_template.py') + setup_file = os.path.join(self._output_path, 'setup.py') if os.path.isfile(setup_file): os.remove(setup_file) @@ -273,9 +273,9 @@ class PublisherService(PublisherABC): setup_py.close() def _run_setup(self): - setup_py = os.path.join(self._output_path, 'setup_template.py') + setup_py = os.path.join(self._output_path, 'setup.py') if not os.path.isfile(setup_py): - Console.error(__name__, f'setup_template.py not found in {self._output_path}') + Console.error(__name__, f'setup.py not found in {self._output_path}') return try: @@ -288,7 +288,7 @@ class PublisherService(PublisherABC): ]) os.remove(setup_py) except Exception as e: - Console.error('Executing setup_template.py failed', str(e)) + Console.error('Executing setup.py failed', str(e)) def include(self, path: str): self._build_settings.included.append(path) @@ -312,7 +312,7 @@ class PublisherService(PublisherABC): Console.spinner('Building application:', self._dist_files, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.blue) Console.write_line('\nPublish:') - Console.spinner('Generating setup_template.py:', self._create_setup, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.blue) - Console.write_line('Running setup_template.py:\n') + Console.spinner('Generating setup.py:', self._create_setup, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.blue) + Console.write_line('Running setup.py:\n') self._run_setup() # Console.spinner('Cleaning dist path:', self._clean_dist_files)