jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 04:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade libnacl (#9769)

Browse Source 
* Upgrade libnacl to 1.6.0

* Small style updates
This commit is contained in:
Fabian Affolter 2017-10-12 18:13:43 +02:00 committed by GitHub
parent 3b5a9e7796
commit 3bdb7052b8
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/device_tracker/owntracks.py
View File

@ -5,23 +5,22 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/device_tracker.owntracks/ https://home-assistant.io/components/device_tracker.owntracks/
""" """
import asyncio import asyncio
import base64
import json import json
import logging import logging
import base64
from collections import defaultdict from collections import defaultdict
import voluptuous as vol import voluptuous as vol
from homeassistant.core import callback
import homeassistant.helpers.config_validation as cv
import homeassistant.components.mqtt as mqtt import homeassistant.components.mqtt as mqtt
from homeassistant.const import STATE_HOME import homeassistant.helpers.config_validation as cv
from homeassistant.util import slugify, decorator
from homeassistant.components import zone as zone_comp from homeassistant.components import zone as zone_comp
from homeassistant.components.device_tracker import PLATFORM_SCHEMA from homeassistant.components.device_tracker import PLATFORM_SCHEMA
from homeassistant.const import STATE_HOME
from homeassistant.core import callback
from homeassistant.util import slugify, decorator
DEPENDENCIES = ['mqtt'] REQUIREMENTS = ['libnacl==1.6.0']
REQUIREMENTS = ['libnacl==1.5.2']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -34,6 +33,8 @@ CONF_SECRET = 'secret'
CONF_WAYPOINT_IMPORT = 'waypoints' CONF_WAYPOINT_IMPORT = 'waypoints'
CONF_WAYPOINT_WHITELIST = 'waypoint_whitelist' CONF_WAYPOINT_WHITELIST = 'waypoint_whitelist'
DEPENDENCIES = ['mqtt']
OWNTRACKS_TOPIC = 'owntracks/#' OWNTRACKS_TOPIC = 'owntracks/#'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({

2
requirements_all.txt
View File

@ -377,7 +377,7 @@ keyring>=9.3,<10.0
# homeassistant.components.device_tracker.owntracks # homeassistant.components.device_tracker.owntracks
# homeassistant.components.device_tracker.owntracks_http # homeassistant.components.device_tracker.owntracks_http
libnacl==1.5.2 libnacl==1.6.0
# homeassistant.components.dyson # homeassistant.components.dyson
libpurecoollink==0.4.2 libpurecoollink==0.4.2

20
tests/components/device_tracker/test_owntracks.py
View File

@ -4,10 +4,9 @@ import json
import unittest import unittest
from unittest.mock import patch from unittest.mock import patch
from tests.common import (assert_setup_component, fire_mqtt_message, mock_coro, from tests.common import (
get_test_home_assistant, mock_mqtt_component, assert_setup_component, fire_mqtt_message, mock_coro, mock_component,
mock_component) get_test_home_assistant, mock_mqtt_component)
import homeassistant.components.device_tracker.owntracks as owntracks import homeassistant.components.device_tracker.owntracks as owntracks
from homeassistant.setup import setup_component from homeassistant.setup import setup_component
from homeassistant.components import device_tracker from homeassistant.components import device_tracker
@ -154,10 +153,12 @@ WAYPOINTS_UPDATED_MESSAGE = {
] ]
} }
WAYPOINT_ENTITY_NAMES = ['zone.greg_phone__exp_wayp1', WAYPOINT_ENTITY_NAMES = [
'zone.greg_phone__exp_wayp2', 'zone.greg_phone__exp_wayp1',
'zone.ram_phone__exp_wayp1', 'zone.greg_phone__exp_wayp2',
'zone.ram_phone__exp_wayp2'] 'zone.ram_phone__exp_wayp1',
'zone.ram_phone__exp_wayp2',
]
REGION_ENTER_ZERO_MESSAGE = { REGION_ENTER_ZERO_MESSAGE = {
'lon': 1.0, 'lon': 1.0,
@ -194,7 +195,8 @@ ENCRYPTED_LOCATION_MESSAGE = {
'9pOw75Lo4gHcyy2wV5CmkjrpKEBR7Qhye4AR0y7hOvlx6U/a3GuY1+W8' '9pOw75Lo4gHcyy2wV5CmkjrpKEBR7Qhye4AR0y7hOvlx6U/a3GuY1+W8'
'I4smrLkwMvGgBOzXSNdVTzbFTHDvG3gRRaNHFkt2+5MsbH2Dd6CXmpzq' 'I4smrLkwMvGgBOzXSNdVTzbFTHDvG3gRRaNHFkt2+5MsbH2Dd6CXmpzq'
'DIfSN7QzwOevuvNIElii5MlFxI6ZnYIDYA/ZdnAXHEVsNIbyT2N0CXt3' 'DIfSN7QzwOevuvNIElii5MlFxI6ZnYIDYA/ZdnAXHEVsNIbyT2N0CXt3'
'fTPzgGtFzsufx40EEUkC06J7QTJl7lLG6qaLW1cCWp86Vp0eL3vtZ6xq')} 'fTPzgGtFzsufx40EEUkC06J7QTJl7lLG6qaLW1cCWp86Vp0eL3vtZ6xq')
}
MOCK_ENCRYPTED_LOCATION_MESSAGE = { MOCK_ENCRYPTED_LOCATION_MESSAGE = {
# Mock-encrypted version of LOCATION_MESSAGE using pickle # Mock-encrypted version of LOCATION_MESSAGE using pickle