Merge branch 'feature/v0.4.3' into develop

Author: KelSolaar

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
 -   repo: https://github.com/ikamensh/flynt/
-    rev: '0.77'
+    rev: '1.0.1'
     hooks:
     -   id: flynt
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.239'
+    rev: 'v0.0.280'
     hooks:
     - id: ruff
 -   repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 23.7.0
     hooks:
     - id: black
       language_version: python3.9

colour/algebra/common.py

@@ -143,7 +143,7 @@ def set_sdiv_mode(
     raise
     """
 
-    global _SDIV_MODE
+    global _SDIV_MODE  # noqa: PLW0603
 
     _SDIV_MODE = cast(
         Literal[
@@ -397,7 +397,7 @@ def set_spow_enable(enable: bool):
     False
     """
 
-    global _SPOW_ENABLED
+    global _SPOW_ENABLED  # noqa: PLW0603
 
     _SPOW_ENABLED = enable
 

colour/algebra/prng.py

@@ -5,6 +5,7 @@
 Defines the random number generator objects:
 
 -   :func:`colour.algebra.random_triplet_generator`
+
 References
 ----------
 -   :cite:`Laurent2012a` : Laurent. (2012). Reproducibility of python

colour/appearance/tests/test_llab.py

@@ -51,7 +51,6 @@ def test_XYZ_to_LLAB(self):
             "colour.appearance.llab.MATRIX_RGB_TO_XYZ_LLAB",
             np.around(np.linalg.inv(llab.MATRIX_XYZ_TO_RGB_LLAB), decimals=4),
         ):
-
             XYZ = np.array([19.01, 20.00, 21.78])
             XYZ_0 = np.array([95.05, 100.00, 108.88])
             Y_b = 20

colour/blindness/machado2009.py

@@ -111,7 +111,6 @@ def matrix_RGB_to_WSYBRG(
     WSYBRG = vector_dot(MATRIX_LMS_TO_WSYBRG, cmfs.values)
     WS, YB, RG = tsplit(WSYBRG)
 
-    # pylint: disable=E1102
     primaries = reshape_msds(
         primaries,
         cmfs.shape,
@@ -304,7 +303,6 @@ def matrix_anomalous_trichromacy_Machado2009(
     """
 
     if cmfs.shape.interval != 1:
-        # pylint: disable=E1102
         cmfs = reshape_msds(
             cmfs,
             SpectralShape(cmfs.shape.start, cmfs.shape.end, 1),

colour/characterisation/aces_it.py

@@ -337,7 +337,7 @@ def read_training_data_rawtoaces_v1() -> MultiSpectralDistributions:
     190
     """
 
-    global _TRAINING_DATA_RAWTOACES_V1
+    global _TRAINING_DATA_RAWTOACES_V1  # noqa: PLW0603
 
     if _TRAINING_DATA_RAWTOACES_V1 is not None:
         training_data = _TRAINING_DATA_RAWTOACES_V1
@@ -391,7 +391,7 @@ def generate_illuminants_rawtoaces_v1() -> CanonicalMapping:
 'D80', 'D85', 'D90', 'D95', 'iso7589']
     """
 
-    global _ILLUMINANTS_RAWTOACES_V1
+    global _ILLUMINANTS_RAWTOACES_V1  # noqa: PLW0603
 
     if _ILLUMINANTS_RAWTOACES_V1 is not None:
         illuminants = _ILLUMINANTS_RAWTOACES_V1
@@ -647,7 +647,6 @@ def training_data_sds_to_RGB(
         runtime_warning(
             f'Aligning "{training_data.name}" training data shape to "{shape}".'
         )
-        # pylint: disable=E1102
         training_data = reshape_msds(training_data, shape, copy=False)
 
     RGB_w = white_balance_multipliers(sensitivities, illuminant)
@@ -739,7 +738,6 @@ def training_data_sds_to_XYZ(
         runtime_warning(
             f'Aligning "{training_data.name}" training data shape to "{shape}".'
         )
-        # pylint: disable=E1102
         training_data = reshape_msds(training_data, shape, copy=False)
 
     XYZ = np.dot(
@@ -1154,14 +1152,12 @@ def matrix_idt(
         runtime_warning(
             f'Aligning "{sensitivities.name}" sensitivities shape to "{shape}".'
         )
-        # pylint: disable=E1102
         sensitivities = reshape_msds(sensitivities, shape, copy=False)
 
     if training_data.shape != shape:
         runtime_warning(
             f'Aligning "{training_data.name}" training data shape to "{shape}".'
         )
-        # pylint: disable=E1102
         training_data = reshape_msds(training_data, shape, copy=False)
 
     illuminant = normalise_illuminant(illuminant, sensitivities)

colour/characterisation/cameras.py

@@ -25,16 +25,13 @@
 )
 from colour.utilities import is_pandas_installed
 
-if TYPE_CHECKING:
+if TYPE_CHECKING or is_pandas_installed():
     from pandas import DataFrame, Series  # pragma: no cover
-else:
-    if is_pandas_installed():
-        from pandas import DataFrame, Series
-    else:  # pragma: no cover
-        from unittest import mock
+else:  # pragma: no cover
+    from unittest import mock
 
-        DataFrame = mock.MagicMock()
-        Series = mock.MagicMock()
+    DataFrame = mock.MagicMock()
+    Series = mock.MagicMock()
 
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2013 Colour Developers"

colour/characterisation/correction.py

@@ -168,7 +168,7 @@ def matrix_augmented_Cheung2004(
             f"{closest_terms} terms!"
         )
 
-    if terms == 3:
+    if terms == 3:  # noqa: RET503
         return RGB
     elif terms == 4:
         return tstack([R, G, B, tail])
@@ -376,7 +376,7 @@ def matrix_augmented_Cheung2004(
                 R * G * B**2,
             ]
         )
-    elif terms == 35:  # noqa: RET503
+    elif terms == 35:
         return tstack(
             [
                 R,
@@ -468,7 +468,7 @@ def polynomial_expansion_Finlayson2015(
             f"{closest_degree} degree!"
         )
 
-    if degree == 1:
+    if degree == 1:  # noqa: RET503
         return RGB
     elif degree == 2:
         if root_polynomial_expansion:
@@ -540,7 +540,7 @@ def polynomial_expansion_Finlayson2015(
                     R * G * B,
                 ]
             )
-    elif degree == 4:  # noqa: RET503
+    elif degree == 4:
         if root_polynomial_expansion:
             return tstack(
                 [

colour/characterisation/displays.py

@@ -26,16 +26,13 @@
 )
 from colour.utilities import is_pandas_installed
 
-if TYPE_CHECKING:
+if TYPE_CHECKING or is_pandas_installed():
     from pandas import DataFrame, Series  # pragma: no cover
-else:
-    if is_pandas_installed():
-        from pandas import DataFrame, Series
-    else:  # pragma: no cover
-        from unittest import mock
+else:  # pragma: no cover
+    from unittest import mock
 
-        DataFrame = mock.MagicMock()
-        Series = mock.MagicMock()
+    DataFrame = mock.MagicMock()
+    Series = mock.MagicMock()
 
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2013 Colour Developers"

colour/characterisation/tests/test_aces_it.py

@@ -1124,7 +1124,6 @@ def test_matrix_idt(self):
             SDS_COLOURCHECKERS["BabelColor Average"].values()
         )
 
-        # pylint: disable=E1102
         np.testing.assert_allclose(
             matrix_idt(
                 reshape_msds(