diff --git a/homeassistant/components/light/tradfri.py b/homeassistant/components/light/tradfri.py index c3632351e5f..3bba6da8dd3 100644 --- a/homeassistant/components/light/tradfri.py +++ b/homeassistant/components/light/tradfri.py @@ -120,6 +120,7 @@ class TradfriGroup(Light): @callback def _async_start_observe(self, exc=None): """Start observation of light.""" + # pylint: disable=import-error from pytradfri.error import PyTradFriError if exc: _LOGGER.warning("Observation failed for %s", self._name, @@ -279,6 +280,7 @@ class TradfriLight(Light): @callback def _async_start_observe(self, exc=None): """Start observation of light.""" + # pylint: disable=import-error from pytradfri.error import PyTradFriError if exc: _LOGGER.warning("Observation failed for %s", self._name, diff --git a/homeassistant/components/sensor/tradfri.py b/homeassistant/components/sensor/tradfri.py index 88a33cb2f8a..d087fdda9f6 100644 --- a/homeassistant/components/sensor/tradfri.py +++ b/homeassistant/components/sensor/tradfri.py @@ -90,6 +90,7 @@ class TradfriDevice(Entity): @callback def _async_start_observe(self, exc=None): """Start observation of light.""" + # pylint: disable=import-error from pytradfri.error import PyTradFriError if exc: _LOGGER.warning("Observation failed for %s", self._name, diff --git a/homeassistant/components/tradfri.py b/homeassistant/components/tradfri.py index 53ea7eac997..5ac4d2a4eb1 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 from homeassistant.util.json import load_json, save_json -REQUIREMENTS = ['pytradfri==4.0.1', - 'DTLSSocket==0.1.4', - 'https://github.com/chrysn/aiocoap/archive/' - '3286f48f0b949901c8b5c04c0719dc54ab63d431.zip' - '#aiocoap==0.3'] +REQUIREMENTS = ['pytradfri[async]==4.1.0'] DOMAIN = 'tradfri' GATEWAY_IDENTITY = 'homeassistant' @@ -143,7 +139,7 @@ def async_setup(hass, config): def _setup_gateway(hass, hass_config, host, identity, key, allow_tradfri_groups): """Create a gateway.""" - from pytradfri import Gateway, RequestError + from pytradfri import Gateway, RequestError # pylint: disable=import-error try: from pytradfri.api.aiocoap_api import APIFactory except ImportError: diff --git a/requirements_all.txt b/requirements_all.txt index f135744c467..7c6ec95b517 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -19,9 +19,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 @@ -345,9 +342,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 @@ -901,7 +895,7 @@ pytile==1.0.0 pytrackr==0.0.5 # homeassistant.components.tradfri -pytradfri==4.0.1 +# pytradfri[async]==4.1.0 # homeassistant.components.device_tracker.unifi pyunifi==2.13 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 9d9725e9e6a..fbd60ffdadc 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -31,8 +31,7 @@ COMMENT_REQUIREMENTS = ( 'envirophat', 'i2csense', 'credstash', - 'aiocoap', # Temp, will be removed when Python 3.4 is no longer supported. - 'DTLSSocket' # Requires cython. + 'pytradfri', ) TEST_REQUIREMENTS = (