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.1.1 (#3796)

pull/3812/head
Fabian Affolter 2016-10-11 08:29:43 +02:00 committed by Paulus Schoutsen
parent 656ee52435
commit a2503e4d13
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,15 @@ from homeassistant.helpers.event import track_point_in_utc_time
from homeassistant.helpers.typing import ConfigType, QueryType from homeassistant.helpers.typing import ConfigType, QueryType
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
DOMAIN = "recorder" DOMAIN = 'recorder'
REQUIREMENTS = ['sqlalchemy==1.0.15'] REQUIREMENTS = ['sqlalchemy==1.1.1']
DEFAULT_URL = "sqlite:///{hass_config_path}" DEFAULT_URL = 'sqlite:///{hass_config_path}'
DEFAULT_DB_FILE = "home-assistant_v2.db" DEFAULT_DB_FILE = 'home-assistant_v2.db'
CONF_DB_URL = "db_url" CONF_DB_URL = 'db_url'
CONF_PURGE_DAYS = "purge_days" CONF_PURGE_DAYS = 'purge_days'
RETRIES = 3 RETRIES = 3
CONNECT_RETRY_WAIT = 10 CONNECT_RETRY_WAIT = 10
@ -56,8 +56,8 @@ _LOGGER = logging.getLogger(__name__)
Session = None # pylint: disable=no-member Session = None # pylint: disable=no-member
def execute(q: QueryType) \ # pylint: disable=invalid-sequence-index
-> List[Any]: # pylint: disable=invalid-sequence-index def execute(q: QueryType) -> List[Any]:
"""Query the database and convert the objects to HA native form. """Query the database and convert the objects to HA native form.
This method also retries a few times in the case of stale connections. This method also retries a few times in the case of stale connections.
@ -101,7 +101,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
global _INSTANCE # pylint: disable=global-statement global _INSTANCE # pylint: disable=global-statement
if _INSTANCE is not None: if _INSTANCE is not None:
_LOGGER.error('Only a single instance allowed.') _LOGGER.error("Only a single instance allowed")
return False return False
purge_days = config.get(DOMAIN, {}).get(CONF_PURGE_DAYS) purge_days = config.get(DOMAIN, {}).get(CONF_PURGE_DAYS)
@ -155,8 +155,7 @@ class Recorder(threading.Thread):
"""A threaded recorder class.""" """A threaded recorder class."""
# pylint: disable=too-many-instance-attributes # pylint: disable=too-many-instance-attributes
def __init__(self, hass: HomeAssistant, purge_days: int, uri: str) \ def __init__(self, hass: HomeAssistant, purge_days: int, uri: str) -> None:
-> None:
"""Initialize the recorder.""" """Initialize the recorder."""
threading.Thread.__init__(self) threading.Thread.__init__(self)

2
requirements_all.txt
View File

@ -458,7 +458,7 @@ speedtest-cli==0.3.4
# homeassistant.components.recorder # homeassistant.components.recorder
# homeassistant.scripts.db_migrator # homeassistant.scripts.db_migrator
sqlalchemy==1.0.15 sqlalchemy==1.1.1
# homeassistant.components.emulated_hue # homeassistant.components.emulated_hue
# homeassistant.components.http # homeassistant.components.http