From 3bdb7052b8a0b91353ab79e0657f133eccea150c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 Oct 2017 18:13:43 +0200
Subject: [PATCH] Upgrade libnacl (#9769)

* Upgrade libnacl to 1.6.0

* Small style updates
---
 .../components/device_tracker/owntracks.py    | 15 +++++++-------
 requirements_all.txt                          |  2 +-
 .../device_tracker/test_owntracks.py          | 20 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/device_tracker/owntracks.py b/homeassistant/components/device_tracker/owntracks.py
index baf085ae41d..60335e2059a 100644
--- a/homeassistant/components/device_tracker/owntracks.py
+++ b/homeassistant/components/device_tracker/owntracks.py
@@ -5,23 +5,22 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.owntracks/
 """
 import asyncio
+import base64
 import json
 import logging
-import base64
 from collections import defaultdict
 
 import voluptuous as vol
 
-from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
 import homeassistant.components.mqtt as mqtt
-from homeassistant.const import STATE_HOME
-from homeassistant.util import slugify, decorator
+import homeassistant.helpers.config_validation as cv
 from homeassistant.components import zone as zone_comp
 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.5.2']
+REQUIREMENTS = ['libnacl==1.6.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,6 +33,8 @@ CONF_SECRET = 'secret'
 CONF_WAYPOINT_IMPORT = 'waypoints'
 CONF_WAYPOINT_WHITELIST = 'waypoint_whitelist'
 
+DEPENDENCIES = ['mqtt']
+
 OWNTRACKS_TOPIC = 'owntracks/#'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
diff --git a/requirements_all.txt b/requirements_all.txt
index eb748a82dcb..075ee4020b5 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -377,7 +377,7 @@ keyring>=9.3,<10.0
 
 # homeassistant.components.device_tracker.owntracks
 # homeassistant.components.device_tracker.owntracks_http
-libnacl==1.5.2
+libnacl==1.6.0
 
 # homeassistant.components.dyson
 libpurecoollink==0.4.2
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index 3a23fe61d41..eb163fdcbdf 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -4,10 +4,9 @@ import json
 import unittest
 from unittest.mock import patch
 
-from tests.common import (assert_setup_component, fire_mqtt_message, mock_coro,
-                          get_test_home_assistant, mock_mqtt_component,
-                          mock_component)
-
+from tests.common import (
+    assert_setup_component, fire_mqtt_message, mock_coro, mock_component,
+    get_test_home_assistant, mock_mqtt_component)
 import homeassistant.components.device_tracker.owntracks as owntracks
 from homeassistant.setup import setup_component
 from homeassistant.components import device_tracker
@@ -154,10 +153,12 @@ WAYPOINTS_UPDATED_MESSAGE = {
     ]
 }
 
-WAYPOINT_ENTITY_NAMES = ['zone.greg_phone__exp_wayp1',
-                         'zone.greg_phone__exp_wayp2',
-                         'zone.ram_phone__exp_wayp1',
-                         'zone.ram_phone__exp_wayp2']
+WAYPOINT_ENTITY_NAMES = [
+    'zone.greg_phone__exp_wayp1',
+    'zone.greg_phone__exp_wayp2',
+    'zone.ram_phone__exp_wayp1',
+    'zone.ram_phone__exp_wayp2',
+]
 
 REGION_ENTER_ZERO_MESSAGE = {
     'lon': 1.0,
@@ -194,7 +195,8 @@ ENCRYPTED_LOCATION_MESSAGE = {
              '9pOw75Lo4gHcyy2wV5CmkjrpKEBR7Qhye4AR0y7hOvlx6U/a3GuY1+W8'
              'I4smrLkwMvGgBOzXSNdVTzbFTHDvG3gRRaNHFkt2+5MsbH2Dd6CXmpzq'
              'DIfSN7QzwOevuvNIElii5MlFxI6ZnYIDYA/ZdnAXHEVsNIbyT2N0CXt3'
-             'fTPzgGtFzsufx40EEUkC06J7QTJl7lLG6qaLW1cCWp86Vp0eL3vtZ6xq')}
+             'fTPzgGtFzsufx40EEUkC06J7QTJl7lLG6qaLW1cCWp86Vp0eL3vtZ6xq')
+}
 
 MOCK_ENCRYPTED_LOCATION_MESSAGE = {
     # Mock-encrypted version of LOCATION_MESSAGE using pickle