Upgrade ColorAide to 6.0.0 and require Python 3.13 for upcoming ST

Author: facelessuser

.python-version

@@ -1 +1 @@
-3.8
+3.13

CHANGES.md

@@ -1,5 +1,10 @@
 # ColorHelper
 
+## 6.5.0
+
+-   **NEW**: Upgrade ColorAide to 6.0.0.
+-   **NEW**: Require Python 3.13 for Sublim Text 4201+.
+
 ## 6.4.5
 
 -   **FIX**: Fix SCSS support.

dependencies.json

@@ -1,8 +1,7 @@
 {
     "*": {
         ">=3124": [
-            "mdpopups",
-            "typing"
+            "mdpopups"
         ]
     }
 }

lib/coloraide/__meta__.py

@@ -193,5 +193,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(5, 1, 0, "final")
+__version_info__ = Version(6, 0, 0, "final")
 __version__ = __version_info__._get_canonical()

lib/coloraide/algebra.py

@@ -3469,34 +3469,6 @@ def reshape(array: ArrayLike | float, new_shape: int | Shape) -> float | Array:
     return m
 
 
-def _shape(a: ArrayLike | float, s: Shape) -> Shape:
-    """
-    Get the shape of the array.
-
-    We only test the first index at each depth for speed.
-    """
-
-    # Found a scalar input
-    if not isinstance(a, Sequence):
-        return s
-
-    # Get the length
-    size = len(a)
-
-    # Array is empty, return the shape
-    if not size:
-        return (size,)
-
-    # Recursively get the shape of the first entry and compare against the others
-    first = _shape(a[0], s)
-    for r in range(1, size):
-        if _shape(a[r], s) != first:
-            raise ValueError('Ragged lists are not supported')
-
-    # Construct the final shape
-    return (size,) + first
-
-
 @overload
 def _quick_shape(a: float) -> EmptyShape:
     ...
@@ -3519,7 +3491,7 @@ def _quick_shape(a: TensorLike) -> TensorShape:
 
 def _quick_shape(a: ArrayLike | float) -> Shape:
     """
-    Acquire shape taking shortcuts by assume a non-ragged, consistently shaped array.
+    Acquire shape taking shortcuts by assuming a non-ragged, consistently shaped array.
 
     No checking for consistency is performed allowing for a quicker check.
     """
@@ -3558,7 +3530,25 @@ def shape(a: TensorLike) -> TensorShape:
 def shape(a: ArrayLike | float) -> Shape:
     """Get the shape of a list."""
 
-    return _shape(a, ())
+    # Found a scalar input
+    if not isinstance(a, Sequence):
+        return ()
+
+    # Get the length
+    size = len(a)
+
+    # Array is empty, return the shape
+    if not size:
+        return (size,)
+
+    # Recursively get the shape of the first entry and compare against the others
+    first = shape(a[0])
+    for r in range(1, size):
+        if shape(a[r]) != first:
+            raise ValueError('Ragged lists are not supported')
+
+    # Construct the final shape
+    return (size,) + first
 
 
 def fill_diagonal(matrix: Matrix | Tensor, val: float | ArrayLike, wrap: bool = False) -> None:

lib/coloraide/cat.py

@@ -18,9 +18,9 @@
         "A": (0.44758, 0.40745),
         "B": (0.34842, 0.35161),
         "C": (0.31006, 0.31616),
-        "D50": (0.34570, 0.35850),  # Use 4 digits like everyone
+        "D50": (0.34570, 0.35850),  # Use 4 digits like everyone (0.34567, 0,35851)
         "D55": (0.33243, 0.34744),
-        "D65": (0.31270, 0.32900),  # Use 4 digits like everyone
+        "D65": (0.31270, 0.32900),  # Use 4 digits like everyone (0.31272, 0,32903)
         "D75": (0.29903, 0.31488),
         "ACES-D60": (0.32168, 0.33767),
         "ASTM-E308-D65": cast('tuple[float, float]', tuple(util.xyz_to_xyY([0.95047, 1.0, 1.08883])[:-1])),

lib/coloraide/color.py

@@ -81,7 +81,7 @@
 from .temperature.ohno_2013 import Ohno2013
 from .temperature.robertson_1968 import Robertson1968
 from .types import Plugin
-from typing import overload, Sequence, Iterable, Any, Callable, Mapping
+from typing import Iterator, overload, Sequence, Iterable, Any, Callable, Mapping
 if (3, 11) <= sys.version_info:
     from typing import Self
 else:
@@ -194,6 +194,11 @@ def __len__(self) -> int:
 
         return len(self._space.channels)
 
+    def __iter__(self) -> Iterator[float]:
+        """Initialize iterator."""
+
+        return iter(self._coords)
+
     @overload
     def __getitem__(self, i: str | int) -> float:
         ...

lib/coloraide/distance/delta_e_cam02.py

@@ -34,9 +34,9 @@ def distance(
 
         # Normal approach to specifying CAM02 target space
         cs = color.CS_MAP[space]
-        if not isinstance(color.CS_MAP[space], CAM02UCS):
+        if not isinstance(cs, CAM02UCS):
             raise ValueError("Distance color space must be derived from CAM02UCS.")
-        model = cs.MODEL  # type: ignore[attr-defined]
+        model = cs.MODEL
         kl = COEFFICENTS[model][0]
 
         j1, a1, b1 = color.convert(space).coords(nans=False)

lib/coloraide/distance/delta_e_cam16.py

@@ -27,9 +27,9 @@ def distance(
 
         # Normal approach to specifying CAM16 target space
         cs = color.CS_MAP[space]
-        if not isinstance(color.CS_MAP[space], CAM16UCS):
+        if not isinstance(cs, CAM16UCS):
             raise ValueError("Distance color space must be derived from CAM16UCS.")
-        model = cs.MODEL  # type: ignore[attr-defined]
+        model = cs.MODEL
         kl = COEFFICENTS[model][0]
 
         j1, a1, b1 = color.convert(space).coords(nans=False)

lib/coloraide/everything.py

@@ -35,6 +35,7 @@
 from .spaces.hct import HCT
 from .spaces.ucs import UCS
 from .spaces.rec709 import Rec709
+from .spaces.rec709_oetf import Rec709OETF
 from .spaces.ryb import RYB, RYBBiased
 from .spaces.cubehelix import Cubehelix
 from .spaces.rec2020_oetf import Rec2020OETF
@@ -61,6 +62,7 @@ class ColorAll(Base):
     [
         # Spaces
         Rec709(),
+        Rec709OETF(),
         DIN99o(),
         LCh99o(),
         Luv(),