diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f321ad..fd611f86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * Make online documentation optional [#476](https://github.com/NLeSC/python-template/pull/476) ### Changed +* added value field to license options [#617](https://github.com/NLeSC/python-template/pull/617) * fix filename typo of githooks [#611](https://github.com/NLeSC/python-template/pull/609) * next_steps.md is shown as a copier message [#609](https://github.com/NLeSC/python-template/pull/609) * Change the default profile to 'recommended' [#598](https://github.com/NLeSC/python-template/pull/598) diff --git a/copier/questions/essential.yml b/copier/questions/essential.yml index 54fe971f..6bb14c7e 100644 --- a/copier/questions/essential.yml +++ b/copier/questions/essential.yml @@ -27,11 +27,18 @@ full_name: license: type: str choices: - - "Apache-2.0" - - "MIT license" - - "BSD license" - - "ISC license" - - "GNU General Public License v3 or later" - - "GNU Lesser General Public License v3 or later" - - "Not open source" - default: "Apache-2.0" + Apache License, Version 2.0: + value: Apachev2 + MIT license: + value: MIT + BSD license: + value: BSD + ISC license: + value: ISC + GNU General Public License v3 or later: + value: GNUv3 + GNU Lesser General Public License v3 or later: + value: GNULesserv3 + Other (add your own license): + value: Other + default: "Apachev2" diff --git a/template/{% if license == 'Apache-2.0' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Apachev2' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'Apache-2.0' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'Apachev2' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'BSD license' %}LICENSE{% endif %}.jinja b/template/{% if license == 'BSD' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'BSD license' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'BSD' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'GNU Lesser General Public License v3 or later' %}LICENSE{% endif %}.jinja b/template/{% if license == 'GNULesserv3' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'GNU Lesser General Public License v3 or later' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'GNULesserv3' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'GNU General Public License v3 or later' %}LICENSE{% endif %}.jinja b/template/{% if license == 'GNUv3' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'GNU General Public License v3 or later' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'GNUv3' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'ISC license' %}LICENSE{% endif %}.jinja b/template/{% if license == 'ISC' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'ISC license' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'ISC' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'MIT licence' %}LICENSE{% endif %}.jinja b/template/{% if license == 'MIT' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'MIT licence' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'MIT' %}LICENSE{% endif %}.jinja diff --git a/template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja deleted file mode 100644 index f816229f..00000000 --- a/template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja +++ /dev/null @@ -1 +0,0 @@ -Not open source diff --git a/template/{% if license == 'Other' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Other' %}LICENSE{% endif %}.jinja new file mode 100644 index 00000000..8716c7ae --- /dev/null +++ b/template/{% if license == 'Other' %}LICENSE{% endif %}.jinja @@ -0,0 +1 @@ +Add your own license