# HG changeset patch
# User Louis Opter <louis@opter.org>
# Date 1486926697 28800
# Node ID e533e28d6da5d37fb304c1fdd82788b76813f3fc
# Parent  a9aba707b064e7702e05ab9cf74dfa77fa489dd5
1.2.1 patches

diff -r a9aba707b064 -r e533e28d6da5 monolight_type_fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/monolight_type_fixes.patch	Sun Feb 12 11:11:37 2017 -0800
@@ -0,0 +1,38 @@
+# HG changeset patch
+# Parent  b875fdbd441682f6c6c4119d921d314c6f7e9107
+monolight: trivial typing fixes
+
+Spotted those things while showing mypy to Joa at Fosdem. It definitely needs
+more work...
+
+diff --git a/apps/monolight/monolight/grids.py b/apps/monolight/monolight/grids.py
+--- a/apps/monolight/monolight/grids.py
++++ b/apps/monolight/monolight/grids.py
+@@ -85,13 +85,13 @@
+ 
+     def shift(self, offset: Position) -> "LedCanvas":
+         class _Proxy:
+-            def __init__(_self, canvas: LedCanvas, shift: Position):
++            def __init__(_self, canvas: LedCanvas, shift: Position) -> None:
+                 _self._canvas = canvas
+                 _self._shift = shift
+ 
+             def set(_self, offset: Position, level: LedLevel) -> None:
+                 offset += _self._shift
+-                return _self._canvas.set(offset, level)
++                _self._canvas.set(offset, level)
+ 
+             def shift(_self, offset: Position) -> LedCanvas:
+                 return cast(LedCanvas, _Proxy(_self, offset))
+diff --git a/apps/monolight/monolight/ui/actions.py b/apps/monolight/monolight/ui/actions.py
+--- a/apps/monolight/monolight/ui/actions.py
++++ b/apps/monolight/monolight/ui/actions.py
+@@ -24,7 +24,7 @@
+ from .. import bulbs
+ 
+ if TYPE_CHECKING:
+-    from ..elements import UIComponent  # noqa
++    from .elements import UIComponent  # noqa
+ 
+ logger = logging.getLogger("monolight.ui.actions")
+ 
diff -r a9aba707b064 -r e533e28d6da5 series
--- a/series	Sat Feb 04 16:27:32 2017 +0100
+++ b/series	Sun Feb 12 11:11:37 2017 -0800
@@ -1,3 +1,6 @@
+monolight_type_fixes.patch
+update_lifx_product_ids.patch
+update_changelog.patch
 add_power_transition.patch #+future
 open_gateway_on_any_bulb_response.patch #+future
 make_gateway_write_callbacks_low_priority.patch #+future
diff -r a9aba707b064 -r e533e28d6da5 update_changelog.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update_changelog.patch	Sun Feb 12 11:11:37 2017 -0800
@@ -0,0 +1,20 @@
+# HG changeset patch
+# Parent  25047f532102215abd5b709fcb768fd38311abdd
+Update the changelog for 1.2.1
+
+diff --git a/docs/changelog.rst b/docs/changelog.rst
+--- a/docs/changelog.rst
++++ b/docs/changelog.rst
+@@ -11,6 +11,12 @@
+   are added in a backwards-compatible manner;
+ - PATCH version gets incremented for backwards-compatible bug fixes.
+ 
++1.2.1 (2017-02-12)
++------------------
++
++This release was mostly done to iron out issues in the release script. The only
++noticeable change is the update to the LIFX product list (closes :gh:`23`).
++
+ 1.2.0 (2017-02-04)
+ ------------------
+ 
diff -r a9aba707b064 -r e533e28d6da5 update_lifx_product_ids.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update_lifx_product_ids.patch	Sun Feb 12 11:11:37 2017 -0800
@@ -0,0 +1,28 @@
+# HG changeset patch
+# Parent  f3777e19eb31224131d0d8ca647c54b3521171b9
+lightsd: Update LIFX products ids (closes GH-23)
+
+diff --git a/lifx/bulb.c b/lifx/bulb.c
+--- a/lifx/bulb.c
++++ b/lifx/bulb.c
+@@ -66,8 +66,20 @@
+         return "White 800";
+     case 0x12:
+         return "White 900 BR30";
++    case 0x14:
++        return "Color 1000 BR30";
+     case 0x16:
+         return "Color 1000";
++    case 0x1b:
++        return "A19";
++    case 0x1c:
++        return "BR30";
++    case 0x1d:
++        return "A19+";
++    case 0x1e:
++        return "BR30+";
++    case 0x1f:
++        return "Z";
+     default:
+         return "Unknown";
+     }