From f028d9ad2e73d154f861c4246f317ee6cc37fbc9 Mon Sep 17 00:00:00 2001 From: Histausse Date: Tue, 16 May 2023 12:53:02 +0200 Subject: [PATCH] clean up licenses --- TODO.md | 1 - cookiecutter.json | 2 +- {{ cookiecutter.project_slug }}/LICENSE | 39 +++++++++++++------------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/TODO.md b/TODO.md index 816fc7d..a3b6fe0 100644 --- a/TODO.md +++ b/TODO.md @@ -1,6 +1,5 @@ # TODO: -- add AGPL - add CI - add flake - use bool value for `generate_gitea_project` when the feature is available diff --git a/cookiecutter.json b/cookiecutter.json index 899337e..ba2add7 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -10,6 +10,6 @@ "generate_gitea_project": [ true, false ], "git_origin": "{{ cookiecutter.gitea_url.replace('https://', 'gitea@').replace('http://', 'gitea') }}:{{ cookiecutter.git_user }}/{{ cookiecutter.project_slug }}.git", "version": "0.1.0", - "open_source_license": ["GNU General Public License v3", "MIT license", "BSD license", "ISC license", "Apache Software License 2.0", "Proprietary"], + "open_source_license": ["AGPL-3.0-only", "GPL-3.0-only", "MIT", "BSD-3-Clause", "ISC", "Apache-2.0", "Proprietary"], "python_min_version": "3.10" } diff --git a/{{ cookiecutter.project_slug }}/LICENSE b/{{ cookiecutter.project_slug }}/LICENSE index 24b2600..28b9eca 100644 --- a/{{ cookiecutter.project_slug }}/LICENSE +++ b/{{ cookiecutter.project_slug }}/LICENSE @@ -1,4 +1,4 @@ -{% if cookiecutter.open_source_license == 'MIT license' -%} +{% if cookiecutter.open_source_license == 'MIT' -%} MIT License Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} @@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -{% elif cookiecutter.open_source_license == 'BSD license' %} +{% elif cookiecutter.open_source_license == 'BSD-3-Clause' %} BSD License @@ -51,7 +51,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -{% elif cookiecutter.open_source_license == 'ISC license' -%} +{% elif cookiecutter.open_source_license == 'ISC' -%} ISC License Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} @@ -59,7 +59,7 @@ Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -{% elif cookiecutter.open_source_license == 'Apache Software License 2.0' -%} +{% elif cookiecutter.open_source_license == 'Apache-2.0' -%} Apache Software License 2.0 Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} @@ -75,7 +75,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -{% elif cookiecutter.open_source_license == 'GNU General Public License v3' -%} +{% elif cookiecutter.open_source_license == 'GPL-3.0-only' -%} GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 @@ -84,8 +84,7 @@ GNU GENERAL PUBLIC LICENSE This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + the Free Software Foundation, version 3. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -94,18 +93,22 @@ GNU GENERAL PUBLIC LICENSE You should have received a copy of the GNU General Public License along with this program. If not, see . +{% elif cookiecutter.open_source_license == 'AGPL-3.0-only' %} +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -Also add information on how to contact you by electronic and paper mail. + {{ cookiecutter.project_short_description }} + Copyright (C) {% now 'local', '%Y' %} {{ cookiecutter.full_name }} - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, version 3. - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . {% endif %}