Skip to content

Commit

Permalink
Switch from GPLv3 to AGPLv3 notices in source files
Browse files Browse the repository at this point in the history
  • Loading branch information
x0s committed Jun 23, 2020
1 parent 4075d79 commit 3cbd101
Show file tree
Hide file tree
Showing 35 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Copyright (c) 2019-2020 Pyronear contributors.

This software is made available under the terms of *either* of the licenses:
- CEA CNRS Inria Logiciel Libre License, v2.1: for more details, please see LICENSE.CeCILL
- GNU General Public License v3: for more details, please see LICENSE.GPL
- GNU Affero General Public License v3: for more details, please see LICENSE.AGPL

Contributions to this software is made under the terms of *both* these licenses.

You should have received a copy of the CeCILL and the GNU GPL licenses along
You should have received a copy of the CeCILL and the GNU AGPL licenses along
with this program. If not, see <https://cecill.info/licences.en.html> and <http://www.gnu.org/licenses/>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ This project is developed and maintained by the repo owner and volunteers from [

## License

Distributed under the CeCILL and GPLv3 Licenses. See `LICENSE` for more information.
Distributed under the CeCILL and AGPLv3 Licenses. See `LICENSE` for more information.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

# Configuration file for the Sphinx documentation builder.
Expand Down
2 changes: 1 addition & 1 deletion pyronear/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from pyronear import datasets
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .openfire import OpenFire
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/openfire.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from pathlib import Path
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import requests
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/wildfire/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .fire_labeler import FireLabeler
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/wildfire/fire_labeler.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import re
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/wildfire/frame_extractor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import warnings
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/wildfire/split_strategy.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import abc
Expand Down
2 changes: 1 addition & 1 deletion pyronear/datasets/wildfire/wildfire.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import warnings
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .resnet import *
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/densenet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import re
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/mobilenet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from torchvision.models.mobilenet import MobileNetV2, model_urls as imagenet_urls
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/resnet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from torchvision.models.resnet import BasicBlock, Bottleneck, ResNet, model_urls as imagenet_urls
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/ssresnet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from torchvision.models.resnet import ResNet, BasicBlock
Expand Down
2 changes: 1 addition & 1 deletion pyronear/models/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

# Based on https://github.com/fastai/fastai/blob/master/fastai/vision/learner.py
Expand Down
2 changes: 1 addition & 1 deletion pyronear/nn/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .modules import *
2 changes: 1 addition & 1 deletion pyronear/nn/functional.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

# Based on https://github.com/fastai/fastai/blob/master/fastai/layers.py
Expand Down
2 changes: 1 addition & 1 deletion pyronear/nn/modules/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .pooling import AdaptiveConcatPool2d
2 changes: 1 addition & 1 deletion pyronear/nn/modules/pooling.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

# Based on https://github.com/fastai/fastai/blob/master/fastai/layers.py
Expand Down
2 changes: 1 addition & 1 deletion pyronear/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

from .collect_env import get_pretty_env_info
Expand Down
2 changes: 1 addition & 1 deletion pyronear/utils/collect_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

"""
Expand Down
2 changes: 1 addition & 1 deletion references/classification/OpenFire/fastai/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import random
Expand Down
2 changes: 1 addition & 1 deletion references/classification/OpenFire/torch/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import os
Expand Down
2 changes: 1 addition & 1 deletion references/classification/WildFire/torch/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion test/test_datasets.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down
2 changes: 1 addition & 1 deletion test/test_datasets_wildfire.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down
2 changes: 1 addition & 1 deletion test/test_datasets_wildfire_frame_extractor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import glob
Expand Down
2 changes: 1 addition & 1 deletion test/test_datasets_wildfire_split.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down
4 changes: 2 additions & 2 deletions test/test_headers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand All @@ -16,7 +16,7 @@ def setUp(self):
self.header_blank = "\n"

self.header_notice = ("# Copyright (c) Pyronear contributors.\n"
"# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.\n"
"# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.\n"
"# See the LICENSE file in the root of this repository for complete details.\n")

self.excluded_files = ["version.py"]
Expand Down
2 changes: 1 addition & 1 deletion test/test_models.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down
2 changes: 1 addition & 1 deletion test/test_nn.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down
2 changes: 1 addition & 1 deletion test/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Copyright (c) Pyronear contributors.
# This file is dual licensed under the terms of the CeCILL-2.1 and GPLv3 licenses.
# This file is dual licensed under the terms of the CeCILL-2.1 and AGPLv3 licenses.
# See the LICENSE file in the root of this repository for complete details.

import unittest
Expand Down

0 comments on commit 3cbd101

Please sign in to comment.