From c717aaf4333ac051baa43046db41dc55dfbad61a Mon Sep 17 00:00:00 2001 From: Dantali0n <info@dantalion.nl> Date: Thu, 6 Jul 2023 21:14:17 +0200 Subject: [PATCH] Fix paths and submodule hooks --- .gitlab-ci.yml | 3 +-- .gitmodules | 3 --- README.md | 3 ++- hooks/post_gen_project.sh | 7 +++++++ {{cookiecutter.project_slug}}/README.md | 3 +-- {{cookiecutter.project_slug}}/cmake/cmake-extra-utils | 1 - {{cookiecutter.project_slug}}/tox.ini | 1 + 7 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 .gitmodules create mode 100644 hooks/post_gen_project.sh delete mode 160000 {{cookiecutter.project_slug}}/cmake/cmake-extra-utils diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0942036..eda375e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,8 @@ default: # Bootstrap Cookiecutter template to test provided ci pipeline template before_script: - python --version # For debugging - - cookiecutter --no-input --overwrite-if-exists ./ + - cookiecutter --no-input --overwrite-if-exists --output-dir . . - cd my_awesome_app - - git init # Override unit test before script .run_unit_test_version_base: diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 39c26b6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "{{cookiecutter.project_slug}}/cmake/cmake-extra-utils"] - path = {{cookiecutter.project_slug}}/cmake/cmake-extra-utils - url = https://github.com/LecrisUT/CMakeExtraUtils.git diff --git a/README.md b/README.md index ffd874a..8f9500e 100644 --- a/README.md +++ b/README.md @@ -42,4 +42,5 @@ cookiecutter https://git.astron.nl/templates/python-binary-wheel-package.git ``` ## License -This project is licensed under the Apache License Version 2.0 + +This project is licensed under the Apache License Version 2.0 \ No newline at end of file diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh new file mode 100644 index 0000000..708c8f1 --- /dev/null +++ b/hooks/post_gen_project.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +git init +git add --all +git commit -m "initial commit" +git tag v0.0.1 +git submodule add https://github.com/LecrisUT/CMakeExtraUtils.git cmake/cmake-extra-utils \ No newline at end of file diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 428513b..4e6e8c7 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -1,9 +1,8 @@ # {{cookiecutter.project_name}} -<!-- TODO: replace -->   -<!--  --> + {{cookiecutter.description}} diff --git a/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils b/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils deleted file mode 160000 index 26450da..0000000 --- a/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 26450da9dceea86a809fe1a38c095a0c988a6159 diff --git a/{{cookiecutter.project_slug}}/tox.ini b/{{cookiecutter.project_slug}}/tox.ini index 3edee46..30966a5 100644 --- a/{{cookiecutter.project_slug}}/tox.ini +++ b/{{cookiecutter.project_slug}}/tox.ini @@ -11,6 +11,7 @@ setenv = LANGUAGE=en_US LC_ALL=en_US.UTF-8 PYTHONWARNINGS=default::DeprecationWarning + DYNAMIC_VERSION_SOURCE={toxinidir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/tests/requirements.txt -- GitLab