✨ Use SPDX license IDs and add BSD-2-Clause, ISC and -or-later options

Author: sgraaf

.github/workflows/input-for-demo.txt

@@ -7,7 +7,7 @@ steven@vandegraaf.xyz
 sgraaf
 
 
-6
+1
 4
 
 2

cookiecutter.json

@@ -9,15 +9,21 @@
     "version": "{% now 'utc', '%Y' %}.1.0",
     "copyright_year": "{% now 'utc', '%Y' %}",
     "license": [
-        "agpl-3.0",
-        "gpl-3.0",
-        "lgpl-3.0",
-        "mpl-2.0",
-        "apache-2.0",
-        "mit",
-        "unlicense",
-        "bsd-3-clause",
-        "gpl-2.0"
+        "MIT",
+        "Apache-2.0",
+        "GPL-3.0-only",
+        "AGPL-3.0-only",
+        "BSD-3-Clause",
+        "GPL-3.0-or-later",
+        "LGPL-3.0-only",
+        "AGPL-3.0-or-later",
+        "GPL-2.0-only",
+        "BSD-2-Clause",
+        "MPL-2.0",
+        "LGPL-3.0-or-later",
+        "GPL-2.0-or-later",
+        "ISC",
+        "Unlicense"
     ],
     "development_status": [
         "Development Status :: 1 - Planning",
@@ -48,15 +54,21 @@
         "copyright_year": "The copyright year of your package",
         "license": {
             "__prompt__": "Choose a license for your package",
-            "agpl-3.0": "GNU Affero General Public License v3.0",
-            "gpl-3.0": "GNU General Public License v3.0",
-            "lgpl-3.0": "GNU Lesser General Public License v3.0",
-            "mpl-2.0": "Mozilla Public License 2.0",
-            "apache-2.0": "Apache license 2.0",
-            "mit": "MIT",
-            "unlicense": "The Unlicense",
-            "bsd-3-clause": "BSD 3-clause \"New\" or \"Revised\" license",
-            "gpl-2.0": "GNU General Public License v2.0"
+            "MIT": "MIT License",
+            "Apache-2.0": "Apache License 2.0",
+            "GPL-3.0-only": "GNU General Public License v3.0 only",
+            "AGPL-3.0-only": "GNU Affero General Public License v3.0 only",
+            "BSD-3-Clause": "BSD 3-Clause \"New\" or \"Revised\" License",
+            "GPL-3.0-or-later": "GNU General Public License v3.0 or later",
+            "LGPL-3.0-only": "GNU Lesser General Public License v3.0 only",
+            "AGPL-3.0-or-later": "GNU Affero General Public License v3.0 or later",
+            "GPL-2.0-only": "GNU General Public License v2.0 only",
+            "BSD-2-Clause": "BSD 2-Clause \"Simplified\" License",
+            "MPL-2.0": "Mozilla Public License 2.0",
+            "LGPL-3.0-or-later": "GNU Lesser General Public License v3.0 or later",
+            "GPL-2.0-or-later": "GNU General Public License v2.0 or later",
+            "ISC": "ISC License",
+            "Unlicense": "The Unlicense"
         },
         "development_status": {
             "__prompt__": "Choose a development status for your package",

{{ cookiecutter.project_name }}/pyproject.toml

@@ -8,25 +8,7 @@ version = "{{ cookiecutter.version }}"
 description = "{{ cookiecutter.short_description }}"
 authors = [{name = "{{ cookiecutter.author }}", email = "{{ cookiecutter.email }}"}]
 readme = "README.md"
-{% if cookiecutter.license == 'agpl-3.0' -%}
-license = "AGPL-3.0-only"
-{% elif cookiecutter.license == 'gpl-3.0' -%}
-license = "GPL-3.0-only"
-{% elif cookiecutter.license == 'lgpl-3.0' -%}
-license = "LGPL-3.0-only"
-{% elif cookiecutter.license == 'mpl-2.0' -%}
-license = "MPL-2.0"
-{% elif cookiecutter.license == 'apache-2.0' -%}
-license = "Apache-2.0"
-{% elif cookiecutter.license == 'mit' -%}
-license = "MIT"
-{% elif cookiecutter.license == 'unlicense' -%}
-license = "Unlicense"
-{% elif cookiecutter.license == 'bsd-3-clause' -%}
-license = "BSD-3-Clause"
-{% elif cookiecutter.license == 'gpl-2.0' -%}
-license = "GPL-2.0-only"
-{% endif -%}
+license = "{{ cookiecutter.license }}"
 license-files = ["LICENSE"]
 keywords = []
 classifiers = [