From 40727a99e1a5f65c60a9580432de6e694e4a09bf Mon Sep 17 00:00:00 2001 From: Altynbek Orumbayev Date: Mon, 8 Jul 2024 16:53:05 +0200 Subject: [PATCH] fix: given that .copier-answers.yml is now expected at .algokit folder, improve defaults lookup --- src/algokit/cli/init.py | 6 ++++-- src/algokit/core/generate.py | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/algokit/cli/init.py b/src/algokit/cli/init.py index f6688069f..47b168d00 100644 --- a/src/algokit/cli/init.py +++ b/src/algokit/cli/init.py @@ -361,11 +361,13 @@ def init_command( # noqa: PLR0913, C901, PLR0915 from algokit.core.init import populate_default_answers - answers_file = project_path / ".algokit" / ".copier-answers.yml" + expected_answers_file = project_path / ".algokit" / ".copier-answers.yml" + relative_answers_file = expected_answers_file.relative_to(project_path) if expected_answers_file.exists() else None + with Worker( src_path=template.url, dst_path=project_path, - answers_file=answers_file if answers_file.exists() else None, + answers_file=relative_answers_file, data=answers_dict, quiet=True, vcs_ref=template.branch or template.commit, diff --git a/src/algokit/core/generate.py b/src/algokit/core/generate.py index caad1933a..13972d414 100644 --- a/src/algokit/core/generate.py +++ b/src/algokit/core/generate.py @@ -49,7 +49,11 @@ def run_generator(answers: dict, path: Path) -> None: from copier.main import Worker cwd = Path.cwd() + expected_answers_file = cwd / ".algokit" / ".copier-answers.yml" + relative_answers_file = expected_answers_file.relative_to(cwd) if expected_answers_file.exists() else None + with Worker( + answers_file=relative_answers_file, src_path=str(path), dst_path=cwd, data=answers_dict,