Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade sqlalchemy to 1.2.5 (#13292)

pull/13290/head
Fabian Affolter 2018-03-17 17:39:24 +01:00 committed by Pascal Vizeli
parent e01a0f91d6
commit aec61b7c86
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/recorder/__init__.py
View File

@ -35,7 +35,7 @@ from . import migration, purge
from .const import DATA_INSTANCE
from .util import session_scope
REQUIREMENTS = ['sqlalchemy==1.2.2']
REQUIREMENTS = ['sqlalchemy==1.2.5']
_LOGGER = logging.getLogger(__name__)
@ -64,16 +64,13 @@ CONNECT_RETRY_WAIT = 3
FILTER_SCHEMA = vol.Schema({
vol.Optional(CONF_EXCLUDE, default={}): vol.Schema({
vol.Optional(CONF_DOMAINS): vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_ENTITIES): cv.entity_ids,
vol.Optional(CONF_DOMAINS):
vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_EVENT_TYPES):
vol.All(cv.ensure_list, [cv.string])
vol.Optional(CONF_EVENT_TYPES): vol.All(cv.ensure_list, [cv.string]),
}),
vol.Optional(CONF_INCLUDE, default={}): vol.Schema({
vol.Optional(CONF_DOMAINS): vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_ENTITIES): cv.entity_ids,
vol.Optional(CONF_DOMAINS):
vol.All(cv.ensure_list, [cv.string])
})
})
@ -255,7 +252,7 @@ class Recorder(threading.Thread):
self.hass.add_job(register)
result = hass_started.result()
# If shutdown happened before HASS finished starting
# If shutdown happened before Home Assistant finished starting
if result is shutdown_task:
return

2
homeassistant/components/sensor/sql.py
View File

@ -19,7 +19,7 @@ from homeassistant.helpers.entity import Entity
_LOGGER = logging.getLogger(__name__)
REQUIREMENTS = ['sqlalchemy==1.2.2']
REQUIREMENTS = ['sqlalchemy==1.2.5']
CONF_QUERIES = 'queries'
CONF_QUERY = 'query'

2
requirements_all.txt
View File

@ -1165,7 +1165,7 @@ spotcrime==1.0.3
# homeassistant.components.recorder
# homeassistant.scripts.db_migrator
# homeassistant.components.sensor.sql
sqlalchemy==1.2.2
sqlalchemy==1.2.5
# homeassistant.components.statsd
statsd==3.2.1

2
requirements_test_all.txt
View File

@ -176,7 +176,7 @@ somecomfort==0.5.0
# homeassistant.components.recorder
# homeassistant.scripts.db_migrator
# homeassistant.components.sensor.sql
sqlalchemy==1.2.2
sqlalchemy==1.2.5
# homeassistant.components.statsd
statsd==3.2.1