From 91269f351bd222fbba26279c2853d82febbf312c Mon Sep 17 00:00:00 2001 From: edraft Date: Sun, 19 Oct 2025 19:37:13 +0200 Subject: [PATCH] Fixed init command regarding package handling --- src/cli/cpl/cli/utils/structure.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/cli/cpl/cli/utils/structure.py b/src/cli/cpl/cli/utils/structure.py index d8ea7c5d..f737c05b 100644 --- a/src/cli/cpl/cli/utils/structure.py +++ b/src/cli/cpl/cli/utils/structure.py @@ -116,7 +116,7 @@ class Structure: return workspace @staticmethod - def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, install_deps=False, verbose=False): + def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, verbose=False): if not Path(rel_path).exists(): rel_path = click.prompt("Project directory", type=click.Path(exists=True, file_okay=False), default="src") @@ -139,20 +139,19 @@ class Structure: project.save() - if install_deps: - from cpl.cli.command.package.install import install + from cpl.cli.command.package.install import install - old_cwd = os.getcwd() - os.chdir(Path(workspace.path).parent) - install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose) - if project_type in Structure._dependency_map: - for package in Structure._dependency_map[project_type]: - install.callback(package, project.name, dev=False, verbose=verbose) + old_cwd = os.getcwd() + os.chdir(Path(workspace.path).parent) + install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose) + if project_type in Structure._dependency_map: + for package in Structure._dependency_map[project_type]: + install.callback(package, project.name, dev=False, verbose=verbose) - os.chdir(old_cwd) + os.chdir(old_cwd) if workspace is not None: - rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent)) + rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent)).replace("\\", "/") if rel_path not in workspace.projects: workspace.projects.append(rel_path) workspace.save() @@ -200,4 +199,4 @@ class Structure: shutil.copy(src_file, tgt_file) Console.write_line() - Structure.init_project(str(path), name, project_type, workspace, install_deps=True, verbose=verbose) + Structure.init_project(str(path), name, project_type, workspace, verbose=verbose)