Skip to content

Commit

Permalink
Standardise license and copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
gi0baro committed Jan 12, 2020
1 parent e6bfd41 commit 85bdf35
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 56 deletions.
37 changes: 17 additions & 20 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
Copyright (c) 2014-2019 by Giovanni Barillari and contributors.

Some rights reserved.
Copyright 2014 Giovanni Barillari

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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.
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 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.
4 changes: 2 additions & 2 deletions renoir/_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides internally used helpers and objects.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""


Expand Down
4 changes: 2 additions & 2 deletions renoir/_shortcuts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Some shortcuts
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

import hashlib
Expand Down
4 changes: 2 additions & 2 deletions renoir/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides the main apis for the templating system.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

import os
Expand Down
4 changes: 2 additions & 2 deletions renoir/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides caching utils.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

import os
Expand Down
4 changes: 2 additions & 2 deletions renoir/contents.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides structures for templating system.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

# TODO: check unicode conversions
Expand Down
4 changes: 2 additions & 2 deletions renoir/debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
Provides debugging utilities.
:copyright: (c) 2014-2019 by Giovanni Barillari
:copyright: 2014 Giovanni Barillari
Quite a lot of magic comes from Flask (http://flask.pocoo.org)
:copyright: (c) 2014 by Armin Ronacher.
:license: BSD, see LICENSE for more details.
:license: BSD-3-Clause
"""

import sys
Expand Down
4 changes: 2 additions & 2 deletions renoir/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides errors.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

from .helpers import TemplateReference
Expand Down
4 changes: 2 additions & 2 deletions renoir/extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides base classes to create extensions.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""


Expand Down
4 changes: 2 additions & 2 deletions renoir/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides helpers.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

import traceback
Expand Down
4 changes: 2 additions & 2 deletions renoir/lexers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides lexers for templates parsing.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""


Expand Down
4 changes: 2 additions & 2 deletions renoir/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides the templating parser.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

import os
Expand Down
4 changes: 2 additions & 2 deletions renoir/writers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Provides the writers for the templating system.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
:copyright: 2014 Giovanni Barillari
:license: BSD-3-Clause
"""

from io import StringIO
Expand Down
3 changes: 0 additions & 3 deletions tests/test_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
-----------
Tests cache module.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
"""

import pytest
Expand Down
3 changes: 0 additions & 3 deletions tests/test_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
----------------
Tests extensions module.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
"""

import pytest
Expand Down
3 changes: 0 additions & 3 deletions tests/test_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
------------
Tests parser module.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
"""

import pytest
Expand Down
3 changes: 0 additions & 3 deletions tests/test_templater.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
---------------
Tests templater module.
:copyright: (c) 2014-2019 by Giovanni Barillari
:license: BSD, see LICENSE for more details.
"""

import os
Expand Down

0 comments on commit 85bdf35

Please sign in to comment.