Update coloraide 2.0.2

Author: facelessuser

lib/coloraide/__meta__.py

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

lib/coloraide/harmonies.py

@@ -4,7 +4,7 @@
 from .spaces import Cylindrical
 from .cat import WHITES
 from . import util
-from typing import TYPE_CHECKING, Optional, List, Any  # noqa: F401
+from typing import TYPE_CHECKING, Optional, List, Dict, Any  # noqa: F401
 
 if TYPE_CHECKING:  # pragma: no cover
     from .color import Color
@@ -92,23 +92,23 @@ def harmonize(self, color: 'Color', space: Optional[str]) -> List['Color']:
         if steps_b <= 1:
             left = []
             if steps_b == 1:
-                left.extend(color.steps([b, color], steps=steps_b, **kwargs))
+                left.extend(color1.steps([b, color1], steps=steps_b, **kwargs))
             steps = min(self.RANGE - (1 + steps_b), steps_w)
-            right = color.steps([color1, w], steps=steps, **kwargs)[rtrim]
+            right = color1.steps([color1, w], steps=steps, **kwargs)[rtrim]
 
         # Very close to white or is white, no need to interpolate from current color to white
         elif steps_w <= 1:
             right = []
             if steps_w == 1:
-                right.extend(color.steps([color1, w], steps=steps_w, **kwargs))
+                right.extend(color1.steps([color1, w], steps=steps_w, **kwargs))
             steps = min(self.RANGE - (1 + steps_w), steps_b)
-            right.insert(0, color.clone())
-            left = color.steps([b, color], steps=steps, **kwargs)[ltrim]
+            right.insert(0, color1.clone())
+            left = color1.steps([b, color1], steps=steps, **kwargs)[ltrim]
 
         # Anything else in between
         else:
-            left = color.steps([b, color], steps=steps_b, **kwargs)[ltrim]
-            right = color.steps([color1, w], steps=steps_w, **kwargs)[rtrim]
+            left = color1.steps([b, color1], steps=steps_b, **kwargs)[ltrim]
+            right = color1.steps([color1, w], steps=steps_w, **kwargs)[rtrim]
 
         # Extract a subset of the results
         len_l = len(left)

lib/coloraide/spaces/hwb/__init__.py

@@ -1,6 +1,7 @@
 """HWB class."""
 from ...spaces import Space, Cylindrical
 from ...cat import WHITES
+from ... import util
 from ...channels import Channel, FLG_ANGLE, FLG_OPT_PERCENT
 from ...types import Vector
 
@@ -11,25 +12,20 @@ def hwb_to_hsv(hwb: Vector) -> Vector:
     h, w, b = hwb
 
     wb = w + b
-    if 1 - wb < 2e-07:
-        gray = w / wb
-        return [0.0, 0.0, gray]
+    if wb >= 1:
+        return [h, 0.0, w / wb]
 
     v = 1 - b
     s = 0 if v == 0 else 1 - w / v
 
-    return [h, s, v]
+    return [util.constrain_hue(h), s, v]
 
 
 def hsv_to_hwb(hsv: Vector) -> Vector:
     """HSV to HWB."""
 
     h, s, v = hsv
-    w = v * (1 - s)
-    b = 1 - v
-    if 1 - (w + b) < 2e-07:
-        h = 0.0
-    return [h, w, b]
+    return [util.constrain_hue(h), v * (1 - s), 1 - v]
 
 
 class HWB(Cylindrical, Space):
@@ -54,7 +50,7 @@ class HWB(Cylindrical, Space):
     def is_achromatic(self, coords: Vector) -> bool:
         """Check if color is achromatic."""
 
-        if 1 - (coords[1] + coords[2]) < 2e-07:
+        if (coords[1] + coords[2]) >= (1 - 1e-07):
             return True
 
         v = 1 - coords[2]