Merge pull request #16094 from home-assistant/rc

0.76.2

homeassistant/components/frontend/__init__.py

@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180818.0']
+REQUIREMENTS = ['home-assistant-frontend==20180820.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',

homeassistant/components/recorder/migration.py

@@ -57,6 +57,7 @@ def _create_index(engine, table_name, index_name):
     within the table definition described in the models
     """
     from sqlalchemy import Table
+    from sqlalchemy.exc import OperationalError
     from . import models
 
     table = Table(table_name, models.Base.metadata)
@@ -67,7 +68,15 @@ def _create_index(engine, table_name, index_name):
     _LOGGER.info("Adding index `%s` to database. Note: this can take several "
                  "minutes on large databases and slow computers. Please "
                  "be patient!", index_name)
-    index.create(engine)
+    try:
+        index.create(engine)
+    except OperationalError as err:
+        if 'already exists' not in str(err).lower():
+            raise
+
+        _LOGGER.warning('Index %s already exists on %s, continueing',
+                        index_name, table_name)
+
     _LOGGER.debug("Finished creating %s", index_name)
 
 

homeassistant/const.py

@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 76
-PATCH_VERSION = '1'
+PATCH_VERSION = '2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

requirements_all.txt

@@ -432,7 +432,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180818.0
+home-assistant-frontend==20180820.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10

requirements_test_all.txt

@@ -81,7 +81,7 @@ hbmqtt==0.9.2
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180818.0
+home-assistant-frontend==20180820.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

tests/components/recorder/test_migrate.py

@@ -80,3 +80,13 @@ def test_forgiving_add_column():
     migration._add_columns(engine, 'hello', [
         'context_id CHARACTER(36)',
     ])
+
+
+def test_forgiving_add_index():
+    """Test that add index will continue if index exists."""
+    engine = create_engine(
+        'sqlite://',
+        poolclass=StaticPool
+    )
+    models.Base.metadata.create_all(engine)
+    migration._create_index(engine, "states", "ix_states_context_id")