From ae25b75e411cf51b443dfc568f9794b5bd0c9491 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 11:47:18 +0200 Subject: [PATCH 1/3] rename not open source license as other --- copier/questions/essential.yml | 2 +- ...= 'Other (add your own license)' %}LICENSE{% endif %}.jinja} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename template/{{% if license == 'Not open source' %}LICENSE{% endif %}.jinja => {% if license == 'Other (add your own license)' %}LICENSE{% endif %}.jinja} (100%) diff --git a/copier/questions/essential.yml b/copier/questions/essential.yml index 54fe971f..ba38f380 100644 --- a/copier/questions/essential.yml +++ b/copier/questions/essential.yml @@ -33,5 +33,5 @@ license: - "ISC license" - "GNU General Public License v3 or later" - "GNU Lesser General Public License v3 or later" - - "Not open source" + - "Other (add your own license)" default: "Apache-2.0" diff --git a/template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Other (add your own license)' %}LICENSE{% endif %}.jinja similarity index 100% rename from template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja rename to template/{% if license == 'Other (add your own license)' %}LICENSE{% endif %}.jinja From 1d08baf6dfd98b576b01cce6e6537d277a673618 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 12:08:32 +0200 Subject: [PATCH 2/3] fix license values --- copier/questions/essential.yml | 23 ++++++++++++------- ... == 'Apachev2' %}LICENSE{% endif %}.jinja} | 0 ...cense == 'BSD' %}LICENSE{% endif %}.jinja} | 0 ... 'GNULesserv3' %}LICENSE{% endif %}.jinja} | 0 ...nse == 'GNUv3' %}LICENSE{% endif %}.jinja} | 0 ...cense == 'ISC' %}LICENSE{% endif %}.jinja} | 0 ...cense == 'MIT' %}LICENSE{% endif %}.jinja} | 0 ...r own license)' %}LICENSE{% endif %}.jinja | 1 - ...ense == 'Other' %}LICENSE{% endif %}.jinja | 1 + 9 files changed, 16 insertions(+), 9 deletions(-) rename template/{{% if license == 'Apache-2.0' %}LICENSE{% endif %}.jinja => {% if license == 'Apachev2' %}LICENSE{% endif %}.jinja} (100%) rename template/{{% if license == 'BSD license' %}LICENSE{% endif %}.jinja => {% if license == 'BSD' %}LICENSE{% endif %}.jinja} (100%) rename template/{{% if license == 'GNU Lesser General Public License v3 or later' %}LICENSE{% endif %}.jinja => {% if license == 'GNULesserv3' %}LICENSE{% endif %}.jinja} (100%) rename template/{{% if license == 'GNU General Public License v3 or later' %}LICENSE{% endif %}.jinja => {% if license == 'GNUv3' %}LICENSE{% endif %}.jinja} (100%) rename template/{{% if license == 'ISC license' %}LICENSE{% endif %}.jinja => {% if license == 'ISC' %}LICENSE{% endif %}.jinja} (100%) rename template/{{% if license == 'MIT licence' %}LICENSE{% endif %}.jinja => {% if license == 'MIT' %}LICENSE{% endif %}.jinja} (100%) delete mode 100644 template/{% if license == 'Other (add your own license)' %}LICENSE{% endif %}.jinja create mode 100644 template/{% if license == 'Other' %}LICENSE{% endif %}.jinja diff --git a/copier/questions/essential.yml b/copier/questions/essential.yml index ba38f380..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" - - "Other (add your own license)" - 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 == 'Other (add your own license)' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Other (add your own license)' %}LICENSE{% endif %}.jinja deleted file mode 100644 index f816229f..00000000 --- a/template/{% if license == 'Other (add your own license)' %}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 From 89a193af0af26adf5f13af94ef66a3194dfd554c Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 12:12:50 +0200 Subject: [PATCH 3/3] update the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6eed046..ebe4c94f 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) * 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) * Updated the user documentation (README.md) of the template [#569](https://github.com/NLeSC/python-template/pull/569)