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

WIP: dev into master #184

Draft
edraft wants to merge 121 commits from dev into master
pull from: dev
merge into: sh-edraft.de:master
Conversation 1 Commits 121 Files Changed 891 +11 -12
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91269f351b - Show all commits

23
src/cli/cpl/cli/utils/structure.py
View File

@@ -116,7 +116,7 @@ class Structure:
return workspace return workspace
@staticmethod @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(): if not Path(rel_path).exists():
rel_path = click.prompt("Project directory", type=click.Path(exists=True, file_okay=False), default="src") rel_path = click.prompt("Project directory", type=click.Path(exists=True, file_okay=False), default="src")
@@ -139,20 +139,19 @@ class Structure:
project.save() 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() old_cwd = os.getcwd()
os.chdir(Path(workspace.path).parent) os.chdir(Path(workspace.path).parent)
install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose) install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose)
if project_type in Structure._dependency_map: if project_type in Structure._dependency_map:
for package in Structure._dependency_map[project_type]: for package in Structure._dependency_map[project_type]:
install.callback(package, project.name, dev=False, verbose=verbose) install.callback(package, project.name, dev=False, verbose=verbose)
os.chdir(old_cwd) os.chdir(old_cwd)
if workspace is not None: 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: if rel_path not in workspace.projects:
workspace.projects.append(rel_path) workspace.projects.append(rel_path)
workspace.save() workspace.save()
@@ -200,4 +199,4 @@ class Structure:
shutil.copy(src_file, tgt_file) shutil.copy(src_file, tgt_file)
Console.write_line() 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)