Merge pull request #47 from xuhdev/gplv3+

Use "GNU GPL v3.0+" instead of "GNU GPL v3.0"
pytest-dev · Jan 18, 2024 · 6ee0aba · 6ee0aba
2 parents be717b8 + a19d82a
commit 6ee0aba
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Choose from 1, 2, 3 [1]: 1
 Select license:
 1 - MIT
 2 - BSD-3
-3 - GNU GPL v3.0
+3 - GNU GPL v3.0+
 Choose from 1, 2, 3 [1]: 2
 INFO:post_gen_project:Moving files for mkdocs.
 ```
@@ -71,7 +71,7 @@ pytest-awesome/
 - Continuous integration configuration for [AppVeyor]
 - Optional documentation with either [Sphinx] or [MkDocs]
 - Choose from several licenses, such as [MIT], [BSD-3], [Apache v2.0], [GNU GPL
-  v3.0], or [MPL v2.0]
+  v3.0+], or [MPL v2.0]
 
 ## Requirements to Submit a Plugin
 
@@ -135,7 +135,7 @@ Plugin is free and open source software.
   [MIT]: http://opensource.org/licenses/MIT
   [MPL v2.0]: https://www.mozilla.org/media/MPL/2.0/index.txt
   [BSD-3]: http://opensource.org/licenses/BSD-3-Clause
-  [GNU GPL v3.0]: http://www.gnu.org/licenses/gpl-3.0.txt
+  [GNU GPL v3.0+]: http://www.gnu.org/licenses/gpl-3.0.txt
   [Apache v2.0]: http://www.apache.org/licenses/LICENSE-2.0
   [AppVeyor]: http://www.appveyor.com/
   [PyPA Code of Conduct]: https://www.pypa.io/en/latest/code-of-conduct/

diff --git a/cookiecutter.json b/cookiecutter.json
@@ -15,7 +15,7 @@
     "license": [
         "MIT",
         "BSD-3",
-        "GNU GPL v3.0",
+        "GNU GPL v3.0+",
         "Apache Software License 2.0",
         "Mozilla Public License 2.0"
     ]

diff --git a/pytest-{{cookiecutter.plugin_name}}/LICENSE b/pytest-{{cookiecutter.plugin_name}}/LICENSE
@@ -2,7 +2,7 @@
 {%- include 'licenses/MIT' %}
 {%- elif cookiecutter.license == "BSD-3" -%}
 {%- include 'licenses/BSD-3' %}
-{%- elif cookiecutter.license == "GNU GPL v3.0" -%}
+{%- elif cookiecutter.license == "GNU GPL v3.0+" -%}
 {%- include 'licenses/GPL-3' %}
 {%- elif cookiecutter.license == "Apache Software License 2.0" -%}
 {%- include 'licenses/Apache-2' %}

diff --git a/pytest-{{cookiecutter.plugin_name}}/setup.py b/pytest-{{cookiecutter.plugin_name}}/setup.py
@@ -44,8 +44,8 @@ def read(fname):
         'License :: OSI Approved :: MIT License',
         {%- elif cookiecutter.license == "BSD-3" -%}
         'License :: OSI Approved :: BSD License',
-        {%- elif cookiecutter.license == "GNU GPL v3.0" -%}
-        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        {%- elif cookiecutter.license == "GNU GPL v3.0+" -%}
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         {%- elif cookiecutter.license == "Apache Software License 2.0" -%}
         'License :: OSI Approved :: Apache Software License',
         {%- elif cookiecutter.license == "Mozilla Public License 2.0" -%}