From 368c4fea46fce7b0dc5abf00a5fe5d455a328b90 Mon Sep 17 00:00:00 2001 From: ReubenFrankel <60552974+ReubenFrankel@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:21:36 +0000 Subject: [PATCH] Don't error trying to remove template `.vscode` directory, if it doesn't exist --- cookiecutter/mapper-template/hooks/post_gen_project.py | 2 +- .../{{cookiecutter.mapper_id}}/.pre-commit-config.yaml | 4 ++++ cookiecutter/target-template/hooks/post_gen_project.py | 2 +- .../{{cookiecutter.target_id}}/.pre-commit-config.yaml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cookiecutter/mapper-template/hooks/post_gen_project.py b/cookiecutter/mapper-template/hooks/post_gen_project.py index a700beb50..c1c8bc716 100644 --- a/cookiecutter/mapper-template/hooks/post_gen_project.py +++ b/cookiecutter/mapper-template/hooks/post_gen_project.py @@ -14,4 +14,4 @@ shutil.rmtree(Path(".github")) if "{{ cookiecutter.ide }}" != "VSCode": - shutil.rmtree(".vscode") + shutil.rmtree(".vscode", ignore_errors=True) diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/.pre-commit-config.yaml b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/.pre-commit-config.yaml index 60c8e641a..7e66ac1c0 100644 --- a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/.pre-commit-config.yaml +++ b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/.pre-commit-config.yaml @@ -8,6 +8,10 @@ repos: rev: v4.5.0 hooks: - id: check-json + exclude: | + (?x)^( + .*/launch.json + )$ - id: check-toml - id: check-yaml - id: end-of-file-fixer diff --git a/cookiecutter/target-template/hooks/post_gen_project.py b/cookiecutter/target-template/hooks/post_gen_project.py index a700beb50..c1c8bc716 100644 --- a/cookiecutter/target-template/hooks/post_gen_project.py +++ b/cookiecutter/target-template/hooks/post_gen_project.py @@ -14,4 +14,4 @@ shutil.rmtree(Path(".github")) if "{{ cookiecutter.ide }}" != "VSCode": - shutil.rmtree(".vscode") + shutil.rmtree(".vscode", ignore_errors=True) diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/.pre-commit-config.yaml b/cookiecutter/target-template/{{cookiecutter.target_id}}/.pre-commit-config.yaml index d740e8a88..f66b321b2 100644 --- a/cookiecutter/target-template/{{cookiecutter.target_id}}/.pre-commit-config.yaml +++ b/cookiecutter/target-template/{{cookiecutter.target_id}}/.pre-commit-config.yaml @@ -8,6 +8,10 @@ repos: rev: v4.5.0 hooks: - id: check-json + exclude: | + (?x)^( + .*/launch.json + )$ - id: check-toml - id: check-yaml - id: end-of-file-fixer