From 7de4657d245a65c14c3b0c24c59c0a856a38636e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Tue, 13 Nov 2018 11:05:47 +0100 Subject: [PATCH] [IMP] copyright headers Use GPL licenses everywhere, to match original code. --- server_environment/__manifest__.py | 24 ++++--------------- server_environment/models/server_env_mixin.py | 2 +- server_environment/tests/__init__.py | 19 --------------- server_environment/tests/common.py | 2 +- .../tests/test_environment_variable.py | 2 +- .../tests/test_server_environment.py | 21 ++-------------- .../__manifest__.py | 24 ++++--------------- 7 files changed, 13 insertions(+), 81 deletions(-) diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py index 0e14a45..e1f1d66 100644 --- a/server_environment/__manifest__.py +++ b/server_environment/__manifest__.py @@ -1,22 +1,6 @@ -############################################################################## -# -# Adapted by Nicolas Bessi. Copyright Camptocamp SA -# Based on Florent Xicluna original code. Copyright Wingo SA -# -# 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. -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################## +# Copyright Wingo SA +# Copyright 2018 Camptocamp (https://www.camptocamp.com). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "server configuration environment files", @@ -27,7 +11,7 @@ ], "author": "Camptocamp,Odoo Community Association (OCA)", "summary": "move some configurations out of the database", - "website": "http://odoo-community.org/", + "website": "http://github.com/OCA/server-env", "license": "GPL-3 or any later version", "category": "Tools", "data": [ diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py index bde7b37..ca9b33c 100644 --- a/server_environment/models/server_env_mixin.py +++ b/server_environment/models/server_env_mixin.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). import logging diff --git a/server_environment/tests/__init__.py b/server_environment/tests/__init__.py index 4c7aa90..7309347 100644 --- a/server_environment/tests/__init__.py +++ b/server_environment/tests/__init__.py @@ -1,21 +1,2 @@ -############################################################################## -# -# Author: Nicolas Bessi -# Copyright 2014 Camptocamp SA -# -# 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, either version 3 of the -# License, or (at your option) any later version. -# -# 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 . -# -############################################################################## from . import test_server_environment from . import test_environment_variable diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py index ddf1b11..d74a133 100644 --- a/server_environment/tests/common.py +++ b/server_environment/tests/common.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). import os from contextlib import contextmanager diff --git a/server_environment/tests/test_environment_variable.py b/server_environment/tests/test_environment_variable.py index 6d29dc5..469bc18 100644 --- a/server_environment/tests/test_environment_variable.py +++ b/server_environment/tests/test_environment_variable.py @@ -1,5 +1,5 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.addons.server_environment import server_env diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py index 2212a6c..ee33798 100644 --- a/server_environment/tests/test_server_environment.py +++ b/server_environment/tests/test_server_environment.py @@ -1,22 +1,5 @@ -############################################################################## -# -# Author: Nicolas Bessi -# Copyright 2014 Camptocamp SA -# -# 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, either version 3 of the -# License, or (at your option) any later version. -# -# 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 . -# -############################################################################## +# Copyright 2018 Camptocamp (https://www.camptocamp.com). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.addons.server_environment import server_env from . import common diff --git a/server_environment_files_sample/__manifest__.py b/server_environment_files_sample/__manifest__.py index 29c9941..ecb2308 100644 --- a/server_environment_files_sample/__manifest__.py +++ b/server_environment_files_sample/__manifest__.py @@ -1,22 +1,6 @@ -############################################################################## -# -# Adapted by Nicolas Bessi. Copyright Camptocamp SA -# Based on Florent Xicluna original code. Copyright Wingo SA -# -# 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. -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################## +# Copyright Wingo SA +# Copyright 2018 Camptocamp (https://www.camptocamp.com). +# License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Example server configuration environment files repository module", @@ -24,7 +8,7 @@ "depends": ["base"], "author": "Camptocamp,Odoo Community Association (OCA)", "summary": "sample config file for server_environment", - "website": "http://www.camptocamp.com", + "website": "http://github.com/OCA/server-env", "license": "GPL-3 or any later version", "category": "Tools", "data": [],