Skip to content

Commit 7744d66

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/isort' into develop
2 parents a83b86f + 95d6026 commit 7744d66

File tree

40 files changed

+1914
-1938
lines changed

40 files changed

+1914
-1938
lines changed

‎colour/__init__.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
- volume: Colourspace volumes computation and optimal colour stimuli.
4545
"""
4646

47-
# isort: skip_file
48-
4947
import contextlib
5048
import json
5149
import os
@@ -73,6 +71,8 @@
7371

7472
from colour import plotting # noqa: F401
7573

74+
# isort: split
75+
7676
from .adaptation import (
7777
CHROMATIC_ADAPTATION_METHODS,
7878
CHROMATIC_ADAPTATION_TRANSFORMS,
@@ -109,7 +109,6 @@
109109
VIEWING_CONDITIONS_LLAB,
110110
VIEWING_CONDITIONS_RLAB,
111111
VIEWING_CONDITIONS_ZCAM,
112-
VIEWING_CONDITIONS_sCAM,
113112
CAM16_to_XYZ,
114113
CAM_Specification_ATD95,
115114
CAM_Specification_CAM16,
@@ -121,15 +120,15 @@
121120
CAM_Specification_LLAB,
122121
CAM_Specification_Nayatani95,
123122
CAM_Specification_RLAB,
124-
CAM_Specification_ZCAM,
125123
CAM_Specification_sCAM,
124+
CAM_Specification_ZCAM,
126125
CIECAM02_to_XYZ,
127126
CIECAM16_to_XYZ,
128127
Hellwig2022_to_XYZ,
129128
HelmholtzKohlrausch_effect_luminous_Nayatani1997,
130129
HelmholtzKohlrausch_effect_object_Nayatani1997,
131130
Kim2009_to_XYZ,
132-
sCAM_to_XYZ,
131+
VIEWING_CONDITIONS_sCAM,
133132
XYZ_to_ATD95,
134133
XYZ_to_CAM16,
135134
XYZ_to_CIECAM02,
@@ -140,9 +139,10 @@
140139
XYZ_to_LLAB,
141140
XYZ_to_Nayatani95,
142141
XYZ_to_RLAB,
143-
XYZ_to_ZCAM,
144142
XYZ_to_sCAM,
143+
XYZ_to_ZCAM,
145144
ZCAM_to_XYZ,
145+
sCAM_to_XYZ,
146146
)
147147
from .blindness import (
148148
CVD_MATRICES_MACHADO2010,
@@ -526,7 +526,6 @@
526526
"VIEWING_CONDITIONS_LLAB",
527527
"VIEWING_CONDITIONS_RLAB",
528528
"VIEWING_CONDITIONS_ZCAM",
529-
"VIEWING_CONDITIONS_sCAM",
530529
"CAM16_to_XYZ",
531530
"CAM_Specification_ATD95",
532531
"CAM_Specification_CAM16",
@@ -538,15 +537,15 @@
538537
"CAM_Specification_LLAB",
539538
"CAM_Specification_Nayatani95",
540539
"CAM_Specification_RLAB",
541-
"CAM_Specification_ZCAM",
542540
"CAM_Specification_sCAM",
541+
"CAM_Specification_ZCAM",
543542
"CIECAM02_to_XYZ",
544543
"CIECAM16_to_XYZ",
545544
"Hellwig2022_to_XYZ",
546545
"HelmholtzKohlrausch_effect_luminous_Nayatani1997",
547546
"HelmholtzKohlrausch_effect_object_Nayatani1997",
548547
"Kim2009_to_XYZ",
549-
"sCAM_to_XYZ",
548+
"VIEWING_CONDITIONS_sCAM",
550549
"XYZ_to_ATD95",
551550
"XYZ_to_CAM16",
552551
"XYZ_to_CIECAM02",
@@ -557,9 +556,10 @@
557556
"XYZ_to_LLAB",
558557
"XYZ_to_Nayatani95",
559558
"XYZ_to_RLAB",
560-
"XYZ_to_ZCAM",
561559
"XYZ_to_sCAM",
560+
"XYZ_to_ZCAM",
562561
"ZCAM_to_XYZ",
562+
"sCAM_to_XYZ",
563563
]
564564
__all__ += [
565565
"CVD_MATRICES_MACHADO2010",

‎colour/adaptation/__init__.py‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,97 +33,109 @@
3333
Express, 26(6), 7724. doi:10.1364/OE.26.007724
3434
"""
3535

36-
# isort: skip_file
37-
3836
from __future__ import annotations
3937

4038
import typing
4139

4240
if typing.TYPE_CHECKING:
4341
from colour.hints import Any, ArrayLike, Literal, NDArrayFloat
4442

43+
# isort: split
44+
4545
from colour.utilities import (
4646
CanonicalMapping,
47+
as_float_array,
4748
filter_kwargs,
4849
get_domain_range_scale,
49-
as_float_array,
50+
validate_method,
5051
)
5152

52-
from .datasets import CHROMATIC_ADAPTATION_TRANSFORMS
53+
# isort: split
54+
5355
from .datasets import (
5456
CAT_BIANCO2010,
5557
CAT_BRADFORD,
5658
CAT_CAT02,
5759
CAT_CAT02_BRILL2008,
5860
CAT_CAT16,
59-
CAT_CMCCAT2000,
6061
CAT_CMCCAT97,
62+
CAT_CMCCAT2000,
6163
CAT_FAIRCHILD,
6264
CAT_PC_BIANCO2010,
6365
CAT_SHARP,
6466
CAT_VON_KRIES,
6567
CAT_XYZ_SCALING,
68+
CHROMATIC_ADAPTATION_TRANSFORMS,
6669
)
70+
71+
# isort: split
72+
6773
from .vonkries import (
68-
matrix_chromatic_adaptation_VonKries,
6974
chromatic_adaptation_VonKries,
75+
matrix_chromatic_adaptation_VonKries,
7076
)
77+
78+
# isort: split
79+
7180
from .fairchild1990 import chromatic_adaptation_Fairchild1990
7281
from .fairchild2020 import (
7382
CONDITIONS_DEGREE_OF_ADAPTATION_VK20,
74-
matrix_chromatic_adaptation_vk20,
7583
chromatic_adaptation_vK20,
84+
matrix_chromatic_adaptation_vk20,
7685
)
86+
87+
# isort: split
88+
89+
from .cie1994 import chromatic_adaptation_CIE1994
7790
from .cmccat2000 import (
78-
InductionFactors_CMCCAT2000,
7991
VIEWING_CONDITIONS_CMCCAT2000,
92+
InductionFactors_CMCCAT2000,
93+
chromatic_adaptation_CMCCAT2000,
8094
chromatic_adaptation_forward_CMCCAT2000,
8195
chromatic_adaptation_inverse_CMCCAT2000,
82-
chromatic_adaptation_CMCCAT2000,
8396
)
84-
from .cie1994 import chromatic_adaptation_CIE1994
8597
from .zhai2018 import chromatic_adaptation_Zhai2018
98+
99+
# isort: split
100+
86101
from .li2025 import CAT_CAT16_INVERSE, chromatic_adaptation_Li2025
87-
from colour.utilities import validate_method
88102

89103
__all__ = [
90-
"CHROMATIC_ADAPTATION_TRANSFORMS",
91-
]
92-
__all__ += [
93104
"CAT_BIANCO2010",
94105
"CAT_BRADFORD",
95106
"CAT_CAT02",
96107
"CAT_CAT02_BRILL2008",
97108
"CAT_CAT16",
98-
"CAT_CMCCAT2000",
99109
"CAT_CMCCAT97",
110+
"CAT_CMCCAT2000",
100111
"CAT_FAIRCHILD",
101112
"CAT_PC_BIANCO2010",
102113
"CAT_SHARP",
103114
"CAT_VON_KRIES",
104115
"CAT_XYZ_SCALING",
116+
"CHROMATIC_ADAPTATION_TRANSFORMS",
105117
]
106118
__all__ += [
107-
"matrix_chromatic_adaptation_VonKries",
108119
"chromatic_adaptation_VonKries",
120+
"matrix_chromatic_adaptation_VonKries",
109121
]
110122
__all__ += [
111123
"chromatic_adaptation_Fairchild1990",
112124
]
113125
__all__ += [
114126
"CONDITIONS_DEGREE_OF_ADAPTATION_VK20",
115-
"matrix_chromatic_adaptation_vk20",
116127
"chromatic_adaptation_vK20",
128+
"matrix_chromatic_adaptation_vk20",
129+
]
130+
__all__ += [
131+
"chromatic_adaptation_CIE1994",
117132
]
118133
__all__ += [
119-
"InductionFactors_CMCCAT2000",
120134
"VIEWING_CONDITIONS_CMCCAT2000",
135+
"InductionFactors_CMCCAT2000",
136+
"chromatic_adaptation_CMCCAT2000",
121137
"chromatic_adaptation_forward_CMCCAT2000",
122138
"chromatic_adaptation_inverse_CMCCAT2000",
123-
"chromatic_adaptation_CMCCAT2000",
124-
]
125-
__all__ += [
126-
"chromatic_adaptation_CIE1994",
127139
]
128140
__all__ += [
129141
"chromatic_adaptation_Zhai2018",

‎colour/adaptation/datasets/__init__.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
1-
# isort: skip_file
2-
3-
from .cat import CHROMATIC_ADAPTATION_TRANSFORMS
41
from .cat import (
5-
CAT_XYZ_SCALING,
6-
CAT_VON_KRIES,
2+
CAT_BIANCO2010,
73
CAT_BRADFORD,
8-
CAT_SHARP,
9-
CAT_FAIRCHILD,
10-
CAT_CMCCAT97,
11-
CAT_CMCCAT2000,
124
CAT_CAT02,
135
CAT_CAT02_BRILL2008,
146
CAT_CAT16,
15-
CAT_BIANCO2010,
7+
CAT_CMCCAT97,
8+
CAT_CMCCAT2000,
9+
CAT_FAIRCHILD,
1610
CAT_PC_BIANCO2010,
11+
CAT_SHARP,
12+
CAT_VON_KRIES,
13+
CAT_XYZ_SCALING,
14+
CHROMATIC_ADAPTATION_TRANSFORMS,
1715
)
1816

1917
__all__ = [
20-
"CHROMATIC_ADAPTATION_TRANSFORMS",
21-
]
22-
__all__ += [
23-
"CAT_XYZ_SCALING",
24-
"CAT_VON_KRIES",
18+
"CAT_BIANCO2010",
2519
"CAT_BRADFORD",
26-
"CAT_SHARP",
27-
"CAT_FAIRCHILD",
28-
"CAT_CMCCAT97",
29-
"CAT_CMCCAT2000",
3020
"CAT_CAT02",
3121
"CAT_CAT02_BRILL2008",
3222
"CAT_CAT16",
33-
"CAT_BIANCO2010",
23+
"CAT_CMCCAT97",
24+
"CAT_CMCCAT2000",
25+
"CAT_FAIRCHILD",
3426
"CAT_PC_BIANCO2010",
27+
"CAT_SHARP",
28+
"CAT_VON_KRIES",
29+
"CAT_XYZ_SCALING",
30+
"CHROMATIC_ADAPTATION_TRANSFORMS",
3531
]

0 commit comments

Comments
 (0)