Skip to content

Commit

Permalink
Merge pull request #24047 from home-assistant/rc
Browse files Browse the repository at this point in the history
0.93.2
  • Loading branch information
balloob authored May 23, 2019
2 parents 7818c98 + 8d0b158 commit 77f595c
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
git config --global user.email "[email protected]"
git config --global credential.helper store
echo "https://$(githubToken):[email protected]" > $HOME\.git-credentials
echo "https://$(githubToken):[email protected]" > $HOME/.git-credentials
displayName: 'Install requirements'
- script: |
set -e
Expand Down
5 changes: 3 additions & 2 deletions homeassistant/components/alert/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Support for repeating alerts when conditions are met."""
import asyncio
import logging
from datetime import datetime, timedelta
from datetime import timedelta

import voluptuous as vol

Expand All @@ -13,6 +13,7 @@
SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE, ATTR_ENTITY_ID)
from homeassistant.helpers import service, event
from homeassistant.helpers.entity import ToggleEntity
from homeassistant.util.dt import now

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -222,7 +223,7 @@ async def end_alerting(self):
async def _schedule_notify(self):
"""Schedule a notification."""
delay = self._delay[self._next_delay]
next_msg = datetime.now() + delay
next_msg = now() + delay
self._cancel = \
event.async_track_point_in_time(self.hass, self._notify, next_msg)
self._next_delay = min(self._next_delay + 1, len(self._delay) - 1)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/broadlink/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Broadlink",
"documentation": "https://www.home-assistant.io/components/broadlink",
"requirements": [
"broadlink==0.9.0"
"broadlink==0.10.0"
],
"dependencies": [],
"codeowners": [
Expand Down
23 changes: 11 additions & 12 deletions homeassistant/components/discord/notify.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,20 @@ async def async_send_message(self, message, **kwargs):
_LOGGER.error("No target specified")
return None

if ATTR_DATA in kwargs:
data = kwargs.get(ATTR_DATA)
data = kwargs.get(ATTR_DATA) or {}

if ATTR_IMAGES in data:
images = list()
if ATTR_IMAGES in data:
images = list()

for image in data.get(ATTR_IMAGES):
image_exists = await self.hass.async_add_executor_job(
self.file_exists,
image)
for image in data.get(ATTR_IMAGES):
image_exists = await self.hass.async_add_executor_job(
self.file_exists,
image)

if image_exists:
images.append(image)
else:
_LOGGER.warning("Image not found: %s", image)
if image_exists:
images.append(image)
else:
_LOGGER.warning("Image not found: %s", image)

# pylint: disable=unused-variable
@discord_bot.event
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/traccar/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Traccar",
"documentation": "https://www.home-assistant.io/components/traccar",
"requirements": [
"pytraccar==0.8.0",
"pytraccar==0.9.0",
"stringcase==1.2.0"
],
"dependencies": [],
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""Constants used by Home Assistant components."""
MAJOR_VERSION = 0
MINOR_VERSION = 93
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)
Expand Down
12 changes: 6 additions & 6 deletions homeassistant/scripts/check_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,19 +338,19 @@ def _comp_error(ex, domain, config):
result.add_error("Integration not found: {}".format(domain))
continue

try:
component = integration.get_component()
except ImportError:
result.add_error("Component not found: {}".format(domain))
continue

if (not hass.config.skip_pip and integration.requirements and
not await requirements.async_process_requirements(
hass, integration.domain, integration.requirements)):
result.add_error("Unable to install all requirements: {}".format(
', '.join(integration.requirements)))
continue

try:
component = integration.get_component()
except ImportError:
result.add_error("Component not found: {}".format(domain))
continue

if hasattr(component, 'CONFIG_SCHEMA'):
try:
config = component.CONFIG_SCHEMA(config)
Expand Down
4 changes: 2 additions & 2 deletions requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ boto3==1.9.16
braviarc-homeassistant==0.3.7.dev0

# homeassistant.components.broadlink
broadlink==0.9.0
broadlink==0.10.0

# homeassistant.components.brottsplatskartan
brottsplatskartan==0.0.1
Expand Down Expand Up @@ -1450,7 +1450,7 @@ pytile==2.0.6
pytouchline==0.7

# homeassistant.components.traccar
pytraccar==0.8.0
pytraccar==0.9.0

# homeassistant.components.trackr
pytrackr==0.0.5
Expand Down

0 comments on commit 77f595c

Please sign in to comment.