diff --git a/homeassistant/components/light/tradfri.py b/homeassistant/components/light/tradfri.py index c3632351e5fa6..3cb22e666426d 100644 --- a/homeassistant/components/light/tradfri.py +++ b/homeassistant/components/light/tradfri.py @@ -109,9 +109,6 @@ def async_turn_on(self, **kwargs): keys['transition_time'] = int(kwargs[ATTR_TRANSITION]) * 10 if ATTR_BRIGHTNESS in kwargs: - if kwargs[ATTR_BRIGHTNESS] == 255: - kwargs[ATTR_BRIGHTNESS] = 254 - self.hass.async_add_job(self._api( self._group.set_dimmer(kwargs[ATTR_BRIGHTNESS], **keys))) else: @@ -266,9 +263,6 @@ def async_turn_on(self, **kwargs): keys['transition_time'] = int(kwargs[ATTR_TRANSITION]) * 10 if ATTR_BRIGHTNESS in kwargs: - if kwargs[ATTR_BRIGHTNESS] == 255: - kwargs[ATTR_BRIGHTNESS] = 254 - self.hass.async_add_job(self._api( self._light_control.set_dimmer(kwargs[ATTR_BRIGHTNESS], **keys))) diff --git a/homeassistant/components/tradfri.py b/homeassistant/components/tradfri.py index ead4924d59999..647e6ebbb43e1 100644 --- a/homeassistant/components/tradfri.py +++ b/homeassistant/components/tradfri.py @@ -16,11 +16,7 @@ from homeassistant.const import CONF_HOST from homeassistant.components.discovery import SERVICE_IKEA_TRADFRI -REQUIREMENTS = ['pytradfri==4.0.1', - 'DTLSSocket==0.1.4', - 'https://github.com/chrysn/aiocoap/archive/' - '3286f48f0b949901c8b5c04c0719dc54ab63d431.zip' - '#aiocoap==0.3'] +REQUIREMENTS = ['pytradfri[async]==4.0.3'] DOMAIN = 'tradfri' GATEWAY_IDENTITY = 'homeassistant' diff --git a/requirements_all.txt b/requirements_all.txt index dec8f96f39aaa..f94ac757e7fe6 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -18,9 +18,6 @@ certifi>=2017.4.17 # homeassistant.components.bbb_gpio # Adafruit_BBIO==1.0.0 -# homeassistant.components.tradfri -# DTLSSocket==0.1.4 - # homeassistant.components.doorbird DoorBirdPy==0.0.4 @@ -344,9 +341,6 @@ httplib2==0.10.3 # homeassistant.components.media_player.braviatv https://github.com/aparraga/braviarc/archive/0.3.7.zip#braviarc==0.3.7 -# homeassistant.components.tradfri -# https://github.com/chrysn/aiocoap/archive/3286f48f0b949901c8b5c04c0719dc54ab63d431.zip#aiocoap==0.3 - # homeassistant.components.media_player.spotify https://github.com/happyleavesaoc/spotipy/archive/544614f4b1d508201d363e84e871f86c90aa26b2.zip#spotipy==2.4.4 @@ -896,7 +890,7 @@ pythonwhois==2.4.3 pytrackr==0.0.5 # homeassistant.components.tradfri -pytradfri==4.0.1 +# pytradfri[async]==4.0.3 # homeassistant.components.device_tracker.unifi pyunifi==2.13 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 9d9725e9e6a3f..159faf7ccead1 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -31,8 +31,7 @@ 'envirophat', 'i2csense', 'credstash', - 'aiocoap', # Temp, will be removed when Python 3.4 is no longer supported. - 'DTLSSocket' # Requires cython. + 'pytradfri' ) TEST_REQUIREMENTS = (