deCONZ small improvements (#15128)

* Make sure that bridge id is available for config entry

* Fix so deconz reports proper color values

* Bump dependency to v39

homeassistant/components/deconz/__init__.py

@@ -22,7 +22,7 @@ from .const import (
     CONF_ALLOW_CLIP_SENSOR, CONFIG_FILE, DATA_DECONZ_EVENT,
     DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DOMAIN, _LOGGER)
 
-REQUIREMENTS = ['pydeconz==38']
+REQUIREMENTS = ['pydeconz==39']
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({

homeassistant/components/deconz/config_flow.py

@@ -163,9 +163,6 @@ class DeconzFlowHandler(data_entry_flow.FlowHandler):
         if CONF_API_KEY not in import_config:
             return await self.async_step_link()
 
-        self.deconz_config[CONF_ALLOW_CLIP_SENSOR] = True
-        self.deconz_config[CONF_ALLOW_DECONZ_GROUPS] = True
-        return self.async_create_entry(
-            title='deCONZ-' + self.deconz_config[CONF_BRIDGEID],
-            data=self.deconz_config
-        )
+        user_input = {CONF_ALLOW_CLIP_SENSOR: True,
+                      CONF_ALLOW_DECONZ_GROUPS: True}
+        return await self.async_step_options(user_input=user_input)

homeassistant/components/light/deconz.py

@@ -101,9 +101,11 @@ class DeconzLight(Light):
         return self._light.ct
 
     @property
-    def xy_color(self):
-        """Return the XY color value."""
-        return self._light.xy
+    def hs_color(self):
+        """Return the hs color value."""
+        if self._light.colormode in ('xy', 'hs') and self._light.xy:
+            return color_util.color_xy_to_hs(*self._light.xy)
+        return None
 
     @property
     def is_on(self):

requirements_all.txt

@@ -786,7 +786,7 @@ pycsspeechtts==1.0.2
 pydaikin==0.4
 
 # homeassistant.components.deconz
-pydeconz==38
+pydeconz==39
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5

requirements_test_all.txt

@@ -133,7 +133,7 @@ py-canary==0.5.0
 pyblackbird==0.5
 
 # homeassistant.components.deconz
-pydeconz==38
+pydeconz==39
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5