Skip to content

Commit 7c93394

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.2.7' into develop
2 parents 6f3f2b5 + 8fcffbe commit 7c93394

13 files changed

+252
-185
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*.pyc
33
*.pyo
44
.DS_Store
5-
.coverage
5+
.coverage*
66
.idea
77
__pycache__
88
poetry.lock

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
repos:
22
- repo: https://github.com/ikamensh/flynt/
3-
rev: '0.77'
3+
rev: '1.0.1'
44
hooks:
55
- id: flynt
66
- repo: https://github.com/charliermarsh/ruff-pre-commit
7-
rev: 'v0.0.239'
7+
rev: 'v0.0.285'
88
hooks:
99
- id: ruff
1010
- repo: https://github.com/psf/black
11-
rev: 22.10.0
11+
rev: 23.7.0
1212
hooks:
1313
- id: black
1414
language_version: python3.9

‎CONTRIBUTORS.rst

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

1414
| **Colour - Dash** by Colour Developers
1515
| Copyright 2018 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
16-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
16+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
1717
| `https://github.com/colour-science/colour-dash <https://github.com/colour-science/colour-dash>`__

‎LICENSE

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1-
Copyright (C) 2018-2021, Colour Developers
2-
All rights reserved.
1+
Copyright 2013 Colour Developers
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Colour - Dash
66
Introduction
77
------------
88

9-
Various colour science `Dash <https://dash.plot.ly/>`__ apps built on top of
9+
Various colour science `Dash <https://dash.plot.ly>`__ apps built on top of
1010
`Colour <https://github.com/colour-science/colour>`__.
1111

1212
Installation
@@ -43,7 +43,7 @@ Code of Conduct
4343
---------------
4444

4545
The *Code of Conduct*, adapted from the `Contributor Covenant 1.4 <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>`__,
46-
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct/>`__ page.
46+
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct>`__ page.
4747

4848
Contact & Social
4949
----------------
@@ -60,5 +60,5 @@ About
6060

6161
| **Colour - Dash** by Colour Developers
6262
| Copyright 2018 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
63-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
63+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
6464
| `https://github.com/colour-science/colour-dash <https://github.com/colour-science/colour-dash>`__

‎app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
__author__ = "Colour Developers"
1313
__copyright__ = "Copyright 2018 Colour Developers"
14-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
14+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
1515
__maintainer__ = "Colour Developers"
1616
__email__ = "colour-developers@colour-science.org"
1717
__status__ = "Production"
@@ -20,7 +20,7 @@
2020

2121
__major_version__ = "0"
2222
__minor_version__ = "2"
23-
__change_version__ = "6"
23+
__change_version__ = "7"
2424
__version__ = ".".join(
2525
(__major_version__, __minor_version__, __change_version__)
2626
)

‎apps/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
__author__ = "Colour Developers"
1616
__copyright__ = "Copyright 2018 Colour Developers"
17-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
17+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
1818
__maintainer__ = "Colour Developers"
1919
__email__ = "colour-developers@colour-science.org"
2020
__status__ = "Production"
@@ -143,12 +143,12 @@ def spimtx_format_matrix(M: ArrayLike, decimals: int = 10) -> str:
143143
equalitygroup: ""
144144
bitdepth: 32f
145145
description: |
146-
Convert from {input_colourspace} to Linear {output_colourspace}
146+
Convert from Linear {input_colourspace} to Linear {output_colourspace}
147147
isdata: false
148148
encoding: scene-linear
149149
allocation: uniform
150150
from_scene_reference: !<GroupTransform>
151-
name: {input_colourspace} to Linear {output_colourspace}
151+
name: Linear {input_colourspace} to Linear {output_colourspace}
152152
children:
153153
- !<MatrixTransform> {{matrix: {matrix}}}
154154
"""[

‎apps/rgb_colourspace_chromatically_adapted_primaries.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"

‎apps/rgb_colourspace_transformation_matrix.py

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

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

‎index.py

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

1515
__author__ = "Colour Developers"
1616
__copyright__ = "Copyright 2018 Colour Developers"
17-
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
17+
__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
1818
__maintainer__ = "Colour Developers"
1919
__email__ = "colour-developers@colour-science.org"
2020
__status__ = "Production"

0 commit comments

Comments
 (0)