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

Bugfixes

Browse Source
This commit is contained in:
Sven Heidemann
2021-03-13 14:25:08 +01:00
parent 787d285329
commit 8d49d6491c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpl_cli/publish/publisher_service.py
View File

@@ -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)