From 95f2ad2299363cb8943b1ad1b423acc6cc607a74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Apr 2018 23:16:01 +0200 Subject: [PATCH] Upgrade sqlalchemy to 1.2.7 (#14138) --- homeassistant/components/recorder/__init__.py | 2 +- homeassistant/components/sensor/sql.py | 12 ++++++------ requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py index 64e2b85f611..8e69c2cfcd8 100644 --- a/homeassistant/components/recorder/__init__.py +++ b/homeassistant/components/recorder/__init__.py @@ -35,7 +35,7 @@ from . import migration, purge from .const import DATA_INSTANCE from .util import session_scope -REQUIREMENTS = ['sqlalchemy==1.2.6'] +REQUIREMENTS = ['sqlalchemy==1.2.7'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/sensor/sql.py b/homeassistant/components/sensor/sql.py index eeca31fa36b..7d18bb3f049 100644 --- a/homeassistant/components/sensor/sql.py +++ b/homeassistant/components/sensor/sql.py @@ -19,11 +19,11 @@ from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) -REQUIREMENTS = ['sqlalchemy==1.2.6'] +REQUIREMENTS = ['sqlalchemy==1.2.7'] +CONF_COLUMN_NAME = 'column' CONF_QUERIES = 'queries' CONF_QUERY = 'query' -CONF_COLUMN_NAME = 'column' def validate_sql_select(value): @@ -34,9 +34,9 @@ def validate_sql_select(value): _QUERY_SCHEME = vol.Schema({ + vol.Required(CONF_COLUMN_NAME): cv.string, vol.Required(CONF_NAME): cv.string, vol.Required(CONF_QUERY): vol.All(cv.string, validate_sql_select), - vol.Required(CONF_COLUMN_NAME): cv.string, vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string, vol.Optional(CONF_VALUE_TEMPLATE): cv.template, }) @@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ def setup_platform(hass, config, add_devices, discovery_info=None): - """Setup the sensor platform.""" + """Set up the SQL sensor platform.""" db_url = config.get(CONF_DB_URL, None) if not db_url: db_url = DEFAULT_URL.format( @@ -90,10 +90,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): class SQLSensor(Entity): - """An SQL sensor.""" + """Representation of an SQL sensor.""" def __init__(self, name, sessmaker, query, column, unit, value_template): - """Initialize SQL sensor.""" + """Initialize the SQL sensor.""" self._name = name if "LIMIT" in query: self._query = query diff --git a/requirements_all.txt b/requirements_all.txt index 6eb9f91f0e2..d8ee0286c69 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1218,7 +1218,7 @@ spotcrime==1.0.3 # homeassistant.components.recorder # homeassistant.scripts.db_migrator # homeassistant.components.sensor.sql -sqlalchemy==1.2.6 +sqlalchemy==1.2.7 # homeassistant.components.statsd statsd==3.2.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 36e8df39bd3..5d6fe9e2f63 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -188,7 +188,7 @@ somecomfort==0.5.2 # homeassistant.components.recorder # homeassistant.scripts.db_migrator # homeassistant.components.sensor.sql -sqlalchemy==1.2.6 +sqlalchemy==1.2.7 # homeassistant.components.statsd statsd==3.2.1