8000 Update pytradfri to 4.1.0 by lwis · Pull Request #10521 · home-assistant/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update pytradfri to 4.1.0 #10521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 22, 2017
Merged

Update pytradfri to 4.1.0 #10521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cfa5eef
Update pytradfri to 4.0.4
lwis Nov 12, 2017
5d01635
Merge remote-tracking branch 'origin/dev' into update_tradfri
lwis Nov 17, 2017
2c8dae1
Update pytradfri
lwis Nov 17, 2017
f55bc1d
Lint
lwis Nov 17, 2017
0a463af
Lint
lwis Nov 17, 2017
6203bda
Merge remote-tracking branch 'origin/dev' into update_tradfri
lwis Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions homeassistant/components/light/tradfri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ def async_turn_on(self, **kwargs):
@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,
Expand Down Expand Up @@ -279,6 +280,7 @@ def async_turn_on(self, **kwargs):
@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,
Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/sensor/tradfri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def state(self):
@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,
Expand Down
8 changes: 2 additions & 6 deletions homeassistant/components/tradfri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@
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'
Expand Down Expand Up @@ -143,7 +139,7 @@ def gateway_discovered(service, info,
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:
Expand Down
8 changes: 1 addition & 7 deletions requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions script/gen_requirements_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down
0