Skip to content

Commit 7fe5e1d

Browse files
KelSolaarKelSolaar
committed
Improve license reference consistency.
1 parent 4481421 commit 7fe5e1d

File tree

11 files changed

+21
-34
lines changed

11 files changed

+21
-34
lines changed

‎CONTRIBUTORS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ About
1717

1818
| **Colour - Checker Detection** by Colour Developers
1919
| Copyright 2018 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
20-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
20+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
2121
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎LICENSE

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
Copyright 2018 Colour Developers
2-
All rights reserved.
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
6-
* Redistributions of source code must retain the above copyright
7-
notice, this list of conditions and the following disclaimer.
8-
* Redistributions in binary form must reproduce the above copyright
9-
notice, this list of conditions and the following disclaimer in the
10-
documentation and/or other materials provided with the distribution.
11-
* Neither the name of the Colour Developers nor the
12-
names of its contributors may be used to endorse or promote products
13-
derived from this software without specific prior written permission.
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
144

15-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
16-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18-
DISCLAIMED. IN NO EVENT SHALL COLOUR DEVELOPERS BE LIABLE FOR ANY
19-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
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.
8+
9+
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.
10+
11+
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 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

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ A `Python <https://www.python.org/>`__ package implementing various colour
2525
checker detection algorithms and related utilities.
2626

2727
It is open source and freely available under the
28-
`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
28+
`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
2929

3030
.. image:: https://raw.githubusercontent.com/colour-science/colour-checker-detection/master/docs/_static/ColourCheckerDetection_001.png
3131

@@ -128,5 +128,5 @@ About
128128

129129
| **Colour - Checker Detection** by Colour Developers
130130
| Copyright 2018 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
131-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
131+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
132132
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎TODO.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ About
1919

2020
| **Colour - Checker Detection** by Colour Developers
2121
| Copyright 2018 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
22-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
22+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
2323
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎colour_checker_detection/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
__author__ = "Colour Developers"
3131
__copyright__ = "Copyright 2018 Colour Developers"
32-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
32+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
3333
__maintainer__ = "Colour Developers"
3434
__email__ = "colour-developers@colour-science.org"
3535
__status__ = "Production"

‎colour_checker_detection/detection/segmentation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
__author__ = "Colour Developers"
5555
__copyright__ = "Copyright 2018 Colour Developers"
56-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
56+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
5757
__maintainer__ = "Colour Developers"
5858
__email__ = "colour-developers@colour-science.org"
5959
__status__ = "Production"

‎colour_checker_detection/detection/tests/test_segmentation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
__author__ = "Colour Developers"
3434
__copyright__ = "Copyright 2018 Colour Developers"
35-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
35+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
3636
__maintainer__ = "Colour Developers"
3737
__email__ = "colour-developers@colour-science.org"
3838
__status__ = "Production"

‎docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ A `Python <https://www.python.org/>`__ package implementing various colour
55
checker detection algorithms and related utilities.
66

77
It is open source and freely available under the
8-
`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
8+
`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
99

1010
.. image:: https://raw.githubusercontent.com/colour-science/colour-checker-detection/master/docs/_static/ColourCheckerDetection_001.png
1111

@@ -62,5 +62,5 @@ About
6262

6363
| **Colour - Checker Detection** by Colour Developers
6464
| Copyright 2018 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
65-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
65+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
6666
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
__author__ = "Colour Developers"
2626
__copyright__ = "Copyright 2018 Colour Developers"
27-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
27+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
2828
__maintainer__ = "Colour Developers"
2929
__email__ = "colour-developers@colour-science.org"
3030
__status__ = "Production"

‎utilities/export_todo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import os
1111

1212
__copyright__ = "Copyright 2018 Colour Developers"
13-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
13+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
1414
__maintainer__ = "Colour Developers"
1515
__email__ = "colour-developers@colour-science.org"
1616
__status__ = "Production"
@@ -36,7 +36,7 @@
3636
| **Colour - Checker Detection** by Colour Developers
3737
| Copyright 2018 Colour Developers - \
3838
`colour-developers@colour-science.org <colour-developers@colour-science.org>`__
39-
| This software is released under terms of New BSD License: \
39+
| This software is released under terms of BSD-3-Clause: \
4040
https://opensource.org/licenses/BSD-3-Clause
4141
| `https://github.com/colour-science/colour-checker-detection \
4242
<https://github.com/colour-science/colour-checker-detection>`__

0 commit comments

Comments
 (0)