diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 5dbc7b12b..ede14c324 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -123,10 +123,6 @@ def remove_dotgitlabciyml_file(): os.remove(".gitlab-ci.yml") -# def remove_dotgithubciyml_file(): -# os.remove(".github-ci.yml") - - def remove_dotgithub_folder(): shutil.rmtree(".github") @@ -403,9 +399,6 @@ def main(): if "{{ cookiecutter.ci_tool }}".lower() != "gitlab": remove_dotgitlabciyml_file() - # if "{{ cookiecutter.ci_tool }}".lower() != "github": - # remove_dotgithubciyml_file() - if "{{ cookiecutter.ci_tool }}".lower() != "github": remove_dotgithub_folder() diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 172f50ec9..4c681f6c9 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -10,7 +10,6 @@ from binaryornot.check import is_binary PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}" RE_OBJ = re.compile(PATTERN) - @pytest.fixture def context(): return { @@ -139,6 +138,7 @@ def check_paths(paths): @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) def test_project_generation(cookies, context, context_override): """Test that project is generated and fully rendered.""" + result = cookies.bake(extra_context={**context, **context_override}) assert result.exit_code == 0 assert result.exception is None @@ -245,7 +245,7 @@ def test_github_invokes_flake8_and_pytest( assert result.project.basename == context["project_slug"] assert result.project.isdir() - with open(f"{result.project}/.github/workflows/.github-ci.yml", "r") as github_yml: + with open(f"{result.project}/.github/workflows/github-ci.yml", "r") as github_yml: try: github_config = yaml.safe_load(github_yml) assert github_config["flake8"]["script"] == ["flake8"] diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml new file mode 100644 index 000000000..8e8ac8663 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Update Github actions in workflows + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/{{cookiecutter.project_slug}}/.github/workflows/.github-ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/github-ci.yml similarity index 100% rename from {{cookiecutter.project_slug}}/.github/workflows/.github-ci.yml rename to {{cookiecutter.project_slug}}/.github/workflows/github-ci.yml