From e6266715bb5d2c57bd72862ac81006f919126dbc Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 23:59:07 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---
colour_datasets/loaders/dyer2017.py | 136 ++++++++++--------
colour_datasets/loaders/ebner1998.py | 16 +--
.../loaders/tests/test_asano2015.py | 1 -
.../loaders/tests/test_dyer2017.py | 1 -
.../loaders/tests/test_hung1995.py | 1 -
.../loaders/tests/test_jakob2019.py | 1 -
.../loaders/tests/test_jiang2013.py | 1 -
.../loaders/tests/test_karge2015.py | 1 -
.../loaders/tests/test_labsphere2019.py | 1 -
colour_datasets/loaders/tests/test_luo1997.py | 1 -
colour_datasets/loaders/tests/test_luo1999.py | 1 -
.../loaders/tests/test_solomotav2023.py | 1 -
.../loaders/tests/test_winquist2022.py | 1 -
.../loaders/tests/test_xrite2016.py | 1 -
.../loaders/tests/test_zhao2009.py | 1 -
colour_datasets/utilities/common.py | 7 +-
16 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/colour_datasets/loaders/dyer2017.py b/colour_datasets/loaders/dyer2017.py
index 7f69217..5be60f8 100644
--- a/colour_datasets/loaders/dyer2017.py
+++ b/colour_datasets/loaders/dyer2017.py
@@ -564,39 +564,45 @@ def __init__(
self.path = path
self._header: SpectralDataHeader_AMPAS = SpectralDataHeader_AMPAS()
self.header = optional(header, self._header)
- self._units: Literal[
- "absorptance",
- "exitance",
- "flux",
- "intensity",
- "irradiance",
- "radiance",
- "reflectance",
- "relative",
- "transmittance",
- "R-Factor",
- "T-Factor",
- "other",
- ] | None = None
+ self._units: (
+ Literal[
+ "absorptance",
+ "exitance",
+ "flux",
+ "intensity",
+ "irradiance",
+ "radiance",
+ "reflectance",
+ "relative",
+ "transmittance",
+ "R-Factor",
+ "T-Factor",
+ "other",
+ ]
+ | None
+ ) = None
self.units = units
- self._reflection_geometry: Literal[
- "di:8",
- "de:8",
- "8:di",
- "8:de",
- "d:d",
- "d:0",
- "45a:0",
- "45c:0",
- "0:45a",
- "45x:0",
- "0:45x",
- "other",
- ] | None = None
+ self._reflection_geometry: (
+ Literal[
+ "di:8",
+ "de:8",
+ "8:di",
+ "8:de",
+ "d:d",
+ "d:0",
+ "45a:0",
+ "45c:0",
+ "0:45a",
+ "45x:0",
+ "0:45x",
+ "other",
+ ]
+ | None
+ ) = None
self.reflection_geometry = reflection_geometry
- self._transmission_geometry: Literal[
- "0:0", "di:0", "de:0", "0:di", "0:de", "d:d", "other"
- ] | None = None
+ self._transmission_geometry: (
+ Literal["0:0", "di:0", "de:0", "0:di", "0:de", "d:d", "other"] | None
+ ) = None
self.transmission_geometry = transmission_geometry
self._bandwidth_FWHM: float | None = None
self.bandwidth_FWHM = bandwidth_FWHM
@@ -1062,39 +1068,45 @@ def __init__(
self.path = path
self._header: SpectralDataHeader_AMPAS = SpectralDataHeader_AMPAS()
self.header = optional(header, self._header)
- self._units: Literal[
- "absorptance",
- "exitance",
- "flux",
- "intensity",
- "irradiance",
- "radiance",
- "reflectance",
- "relative",
- "transmittance",
- "R-Factor",
- "T-Factor",
- "other",
- ] | None = None
+ self._units: (
+ Literal[
+ "absorptance",
+ "exitance",
+ "flux",
+ "intensity",
+ "irradiance",
+ "radiance",
+ "reflectance",
+ "relative",
+ "transmittance",
+ "R-Factor",
+ "T-Factor",
+ "other",
+ ]
+ | None
+ ) = None
self.units = units
- self._reflection_geometry: Literal[
- "di:8",
- "de:8",
- "8:di",
- "8:de",
- "d:d",
- "d:0",
- "45a:0",
- "45c:0",
- "0:45a",
- "45x:0",
- "0:45x",
- "other",
- ] | None = None
+ self._reflection_geometry: (
+ Literal[
+ "di:8",
+ "de:8",
+ "8:di",
+ "8:de",
+ "d:d",
+ "d:0",
+ "45a:0",
+ "45c:0",
+ "0:45a",
+ "45x:0",
+ "0:45x",
+ "other",
+ ]
+ | None
+ ) = None
self.reflection_geometry = reflection_geometry
- self._transmission_geometry: Literal[
- "0:0", "di:0", "de:0", "0:di", "0:de", "d:d", "other"
- ] | None = None
+ self._transmission_geometry: (
+ Literal["0:0", "di:0", "de:0", "0:di", "0:de", "d:d", "other"] | None
+ ) = None
self.transmission_geometry = transmission_geometry
self._bandwidth_FWHM: float | None = None
self.bandwidth_FWHM = bandwidth_FWHM
diff --git a/colour_datasets/loaders/ebner1998.py b/colour_datasets/loaders/ebner1998.py
index 2552ea0..a52d906 100644
--- a/colour_datasets/loaders/ebner1998.py
+++ b/colour_datasets/loaders/ebner1998.py
@@ -148,14 +148,14 @@ def _parse_float_values(data: str) -> NDArrayFloat:
attribute, value = line.split("\t", 1)
hue, data = int(attribute), _parse_float_values(value)
- self._content["Constant Perceived-Hue Data"][
- hue
- ] = ConstantPerceivedHueColourMatches_Ebner1998(
- f"Reference Hue Angle - {hue}",
- XYZ_r,
- data[0],
- data[1:],
- {"h": hue},
+ self._content["Constant Perceived-Hue Data"][hue] = (
+ ConstantPerceivedHueColourMatches_Ebner1998(
+ f"Reference Hue Angle - {hue}",
+ XYZ_r,
+ data[0],
+ data[1:],
+ {"h": hue},
+ )
)
return self._content
diff --git a/colour_datasets/loaders/tests/test_asano2015.py b/colour_datasets/loaders/tests/test_asano2015.py
index eb48800..8f3ff22 100644
--- a/colour_datasets/loaders/tests/test_asano2015.py
+++ b/colour_datasets/loaders/tests/test_asano2015.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.asano2015` module."""
-
import numpy as np
from colour import SpectralShape
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_dyer2017.py b/colour_datasets/loaders/tests/test_dyer2017.py
index 7708e53..e1d8761 100644
--- a/colour_datasets/loaders/tests/test_dyer2017.py
+++ b/colour_datasets/loaders/tests/test_dyer2017.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.dyer2017` module."""
-
import numpy as np
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_hung1995.py b/colour_datasets/loaders/tests/test_hung1995.py
index a976cae..850f9e6 100644
--- a/colour_datasets/loaders/tests/test_hung1995.py
+++ b/colour_datasets/loaders/tests/test_hung1995.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.hung1995` module."""
-
import numpy as np
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_jakob2019.py b/colour_datasets/loaders/tests/test_jakob2019.py
index 9e124ec..7fa1900 100644
--- a/colour_datasets/loaders/tests/test_jakob2019.py
+++ b/colour_datasets/loaders/tests/test_jakob2019.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.jakob2019` module."""
-
from colour_datasets.loaders import DatasetLoader_Jakob2019, build_Jakob2019
__author__ = "Colour Developers"
diff --git a/colour_datasets/loaders/tests/test_jiang2013.py b/colour_datasets/loaders/tests/test_jiang2013.py
index e7cc64e..f3a632c 100644
--- a/colour_datasets/loaders/tests/test_jiang2013.py
+++ b/colour_datasets/loaders/tests/test_jiang2013.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.jiang2013` module."""
-
from colour import SpectralShape
from colour_datasets.loaders import DatasetLoader_Jiang2013, build_Jiang2013
diff --git a/colour_datasets/loaders/tests/test_karge2015.py b/colour_datasets/loaders/tests/test_karge2015.py
index cb43de6..07669fa 100644
--- a/colour_datasets/loaders/tests/test_karge2015.py
+++ b/colour_datasets/loaders/tests/test_karge2015.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.karge2015` module."""
-
from colour import SpectralShape
from colour_datasets.loaders import DatasetLoader_Karge2015, build_Karge2015
diff --git a/colour_datasets/loaders/tests/test_labsphere2019.py b/colour_datasets/loaders/tests/test_labsphere2019.py
index 18b7d32..0fbf313 100644
--- a/colour_datasets/loaders/tests/test_labsphere2019.py
+++ b/colour_datasets/loaders/tests/test_labsphere2019.py
@@ -3,7 +3,6 @@
module.
"""
-
from colour import SpectralShape
from colour_datasets.loaders import (
diff --git a/colour_datasets/loaders/tests/test_luo1997.py b/colour_datasets/loaders/tests/test_luo1997.py
index f352fac..c6ba504 100644
--- a/colour_datasets/loaders/tests/test_luo1997.py
+++ b/colour_datasets/loaders/tests/test_luo1997.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.luo1997` module."""
-
import numpy as np
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_luo1999.py b/colour_datasets/loaders/tests/test_luo1999.py
index 93b674c..80135ea 100644
--- a/colour_datasets/loaders/tests/test_luo1999.py
+++ b/colour_datasets/loaders/tests/test_luo1999.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.luo1999` module."""
-
import numpy as np
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_solomotav2023.py b/colour_datasets/loaders/tests/test_solomotav2023.py
index af7d72b..0aba835 100644
--- a/colour_datasets/loaders/tests/test_solomotav2023.py
+++ b/colour_datasets/loaders/tests/test_solomotav2023.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.solomotav2023` module."""
-
from colour import SpectralShape
from colour_datasets.loaders import (
diff --git a/colour_datasets/loaders/tests/test_winquist2022.py b/colour_datasets/loaders/tests/test_winquist2022.py
index 155e752..5c05aab 100644
--- a/colour_datasets/loaders/tests/test_winquist2022.py
+++ b/colour_datasets/loaders/tests/test_winquist2022.py
@@ -3,7 +3,6 @@
module.
"""
-
import numpy as np
from colour.constants import TOLERANCE_ABSOLUTE_TESTS
diff --git a/colour_datasets/loaders/tests/test_xrite2016.py b/colour_datasets/loaders/tests/test_xrite2016.py
index 4043f5e..01afa35 100644
--- a/colour_datasets/loaders/tests/test_xrite2016.py
+++ b/colour_datasets/loaders/tests/test_xrite2016.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.xrite2016` module."""
-
from colour.characterisation import ColourChecker
from colour_datasets.loaders import DatasetLoader_XRite2016, build_XRite2016
diff --git a/colour_datasets/loaders/tests/test_zhao2009.py b/colour_datasets/loaders/tests/test_zhao2009.py
index 43fcb14..fa0b045 100644
--- a/colour_datasets/loaders/tests/test_zhao2009.py
+++ b/colour_datasets/loaders/tests/test_zhao2009.py
@@ -1,6 +1,5 @@
"""Define the unit tests for the :mod:`colour_datasets.loaders.zhao2009` module."""
-
from colour import SpectralShape
from colour_datasets.loaders import DatasetLoader_Zhao2009, build_Zhao2009
diff --git a/colour_datasets/utilities/common.py b/colour_datasets/utilities/common.py
index dc7b0ae..18f2ab0 100644
--- a/colour_datasets/utilities/common.py
+++ b/colour_datasets/utilities/common.py
@@ -280,9 +280,10 @@ def unpack_gzipfile(
os.makedirs(extraction_directory)
try:
- with gzip.open(filename) as gzip_file, open(
- extraction_path, "wb"
- ) as output_file:
+ with (
+ gzip.open(filename) as gzip_file,
+ open(extraction_path, "wb") as output_file,
+ ):
shutil.copyfileobj(gzip_file, output_file)
except Exception as error:
print(error) # noqa: T201