Merge pull request #617 from NLeSC/570_license_not_created

570-fix license file generation
NLeSC · Aug 28, 2024 · d21c1d5 · d21c1d5
2 parents 0d9a3e3 + a43fa76
commit d21c1d5
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 9 deletions.
diff --git 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
@@ -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/...= 'Apache-2.0' %}LICENSE{% endif %}.jinja → ... == 'Apachev2' %}LICENSE{% endif %}.jinja b/...= 'Apache-2.0' %}LICENSE{% endif %}.jinja → ... == 'Apachev2' %}LICENSE{% endif %}.jinja
diff --git a/... 'BSD license' %}LICENSE{% endif %}.jinja → ...cense == 'BSD' %}LICENSE{% endif %}.jinja b/... 'BSD license' %}LICENSE{% endif %}.jinja → ...cense == 'BSD' %}LICENSE{% endif %}.jinja
diff --git a/...e v3 or later' %}LICENSE{% endif %}.jinja → ... 'GNULesserv3' %}LICENSE{% endif %}.jinja b/...e v3 or later' %}LICENSE{% endif %}.jinja → ... 'GNULesserv3' %}LICENSE{% endif %}.jinja
diff --git a/...e v3 or later' %}LICENSE{% endif %}.jinja → ...nse == 'GNUv3' %}LICENSE{% endif %}.jinja b/...e v3 or later' %}LICENSE{% endif %}.jinja → ...nse == 'GNUv3' %}LICENSE{% endif %}.jinja
diff --git a/... 'ISC license' %}LICENSE{% endif %}.jinja → ...cense == 'ISC' %}LICENSE{% endif %}.jinja b/... 'ISC license' %}LICENSE{% endif %}.jinja → ...cense == 'ISC' %}LICENSE{% endif %}.jinja
diff --git a/... 'MIT licence' %}LICENSE{% endif %}.jinja → ...cense == 'MIT' %}LICENSE{% endif %}.jinja b/... 'MIT licence' %}LICENSE{% endif %}.jinja → ...cense == '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
diff --git a/template/{% if license == 'Other' %}LICENSE{% endif %}.jinja b/template/{% if license == 'Other' %}LICENSE{% endif %}.jinja
@@ -0,0 +1 @@
+Add your own license