jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-18 02:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rc' into dev

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-03-29 17:23:11 -07:00
commit e5d76c53fb
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/frontend/__init__.py
View File

@ -24,7 +24,7 @@ from homeassistant.core import callback
from homeassistant.helpers.translation import async_get_translations from homeassistant.helpers.translation import async_get_translations
from homeassistant.loader import bind_hass from homeassistant.loader import bind_hass
REQUIREMENTS = ['home-assistant-frontend==20180326.0'] REQUIREMENTS = ['home-assistant-frontend==20180330.0']
DOMAIN = 'frontend' DOMAIN = 'frontend'
DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log'] DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log']

5
homeassistant/const.py
View File

@ -1,8 +1,13 @@
# coding: utf-8 # coding: utf-8
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
<<<<<<< HEAD
MINOR_VERSION = 67 MINOR_VERSION = 67
PATCH_VERSION = '0.dev0' PATCH_VERSION = '0.dev0'
=======
MINOR_VERSION = 66
PATCH_VERSION = '0b3'
>>>>>>> origin/rc
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 5, 3) REQUIRED_PYTHON_VER = (3, 5, 3)

2
requirements_all.txt
View File

@ -366,7 +366,7 @@ hipnotify==1.0.8
holidays==0.9.4 holidays==0.9.4
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180326.0 home-assistant-frontend==20180330.0
# homeassistant.components.homematicip_cloud # homeassistant.components.homematicip_cloud
homematicip==0.8 homematicip==0.8

2
requirements_test_all.txt
View File

@ -81,7 +81,7 @@ hbmqtt==0.9.1
holidays==0.9.4 holidays==0.9.4
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180326.0 home-assistant-frontend==20180330.0
# homeassistant.components.influxdb # homeassistant.components.influxdb
# homeassistant.components.sensor.influxdb # homeassistant.components.sensor.influxdb