From 391a8901c8104de68cccb976a370077f7bef3399 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Dec 2017 10:06:39 +0100 Subject: [PATCH] Upgrade fuzzywuzzy to 0.16.0 (#11331) --- homeassistant/components/conversation.py | 23 ++++++++++++----------- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/conversation.py b/homeassistant/components/conversation.py index 064428c010c..5187b4782ef 100644 --- a/homeassistant/components/conversation.py +++ b/homeassistant/components/conversation.py @@ -12,20 +12,27 @@ import warnings import voluptuous as vol from homeassistant import core -from homeassistant.loader import bind_hass +from homeassistant.components import http from homeassistant.const import ( ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON) -from homeassistant.helpers import intent, config_validation as cv -from homeassistant.components import http +from homeassistant.helpers import config_validation as cv +from homeassistant.helpers import intent +from homeassistant.loader import bind_hass +REQUIREMENTS = ['fuzzywuzzy==0.16.0'] -REQUIREMENTS = ['fuzzywuzzy==0.15.1'] -DEPENDENCIES = ['http'] +_LOGGER = logging.getLogger(__name__) ATTR_TEXT = 'text' + +DEPENDENCIES = ['http'] DOMAIN = 'conversation' +INTENT_TURN_OFF = 'HassTurnOff' +INTENT_TURN_ON = 'HassTurnOn' + REGEX_TURN_COMMAND = re.compile(r'turn (?P(?: |\w)+) (?P\w+)') +REGEX_TYPE = type(re.compile('')) SERVICE_PROCESS = 'process' @@ -39,12 +46,6 @@ CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({ }) })}, extra=vol.ALLOW_EXTRA) -INTENT_TURN_ON = 'HassTurnOn' -INTENT_TURN_OFF = 'HassTurnOff' -REGEX_TYPE = type(re.compile('')) - -_LOGGER = logging.getLogger(__name__) - @core.callback @bind_hass diff --git a/requirements_all.txt b/requirements_all.txt index 2c00fc9954d..ccfc6e79118 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -289,7 +289,7 @@ fritzhome==1.0.3 fsapi==0.0.7 # homeassistant.components.conversation -fuzzywuzzy==0.15.1 +fuzzywuzzy==0.16.0 # homeassistant.components.tts.google gTTS-token==1.1.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index b9e027b1103..018e91f2b0a 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -59,7 +59,7 @@ evohomeclient==0.2.5 feedparser==5.2.1 # homeassistant.components.conversation -fuzzywuzzy==0.15.1 +fuzzywuzzy==0.16.0 # homeassistant.components.tts.google gTTS-token==1.1.1