Skip to content

Commit

Permalink
Merge pull request #8468 from home-assistant/release-0-49
Browse files Browse the repository at this point in the history
0.49
  • Loading branch information
balloob authored Jul 16, 2017
2 parents ee37fc3 + 3377f30 commit dc08852
Show file tree
Hide file tree
Showing 310 changed files with 5,832 additions and 2,170 deletions.
23 changes: 19 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ omit =
homeassistant/components/alarmdecoder.py
homeassistant/components/*/alarmdecoder.py

homeassistant/components/amcrest.py
homeassistant/components/*/amcrest.py

homeassistant/components/apcupsd.py
homeassistant/components/*/apcupsd.py

homeassistant/components/apple_tv.py
homeassistant/components/*/apple_tv.py

homeassistant/components/arduino.py
homeassistant/components/*/arduino.py

Expand Down Expand Up @@ -89,6 +95,9 @@ omit =
homeassistant/components/knx.py
homeassistant/components/*/knx.py

homeassistant/components/lametric.py
homeassistant/components/*/lametric.py

homeassistant/components/lutron.py
homeassistant/components/*/lutron.py

Expand Down Expand Up @@ -164,6 +173,9 @@ omit =
homeassistant/components/notify/twilio_sms.py
homeassistant/components/notify/twilio_call.py

homeassistant/components/velux.py
homeassistant/components/*/velux.py

homeassistant/components/vera.py
homeassistant/components/*/vera.py

Expand Down Expand Up @@ -211,7 +223,6 @@ omit =
homeassistant/components/binary_sensor/rest.py
homeassistant/components/binary_sensor/tapsaff.py
homeassistant/components/browser.py
homeassistant/components/camera/amcrest.py
homeassistant/components/camera/bloomsky.py
homeassistant/components/camera/ffmpeg.py
homeassistant/components/camera/foscam.py
Expand Down Expand Up @@ -301,8 +312,8 @@ omit =
homeassistant/components/lock/nuki.py
homeassistant/components/lock/lockitron.py
homeassistant/components/lock/sesame.py
homeassistant/components/media_extractor.py
homeassistant/components/media_player/anthemav.py
homeassistant/components/media_player/apple_tv.py
homeassistant/components/media_player/aquostv.py
homeassistant/components/media_player/braviatv.py
homeassistant/components/media_player/cast.py
Expand Down Expand Up @@ -339,6 +350,7 @@ omit =
homeassistant/components/media_player/sonos.py
homeassistant/components/media_player/spotify.py
homeassistant/components/media_player/squeezebox.py
homeassistant/components/media_player/vizio.py
homeassistant/components/media_player/vlc.py
homeassistant/components/media_player/volumio.py
homeassistant/components/media_player/yamaha.py
Expand Down Expand Up @@ -375,11 +387,11 @@ omit =
homeassistant/components/notify/twitter.py
homeassistant/components/notify/xmpp.py
homeassistant/components/nuimo_controller.py
homeassistant/components/prometheus.py
homeassistant/components/remote/harmony.py
homeassistant/components/remote/itach.py
homeassistant/components/scene/hunterdouglas_powerview.py
homeassistant/components/scene/lifx_cloud.py
homeassistant/components/sensor/amcrest.py
homeassistant/components/sensor/arest.py
homeassistant/components/sensor/arwn.py
homeassistant/components/sensor/bbox.py
Expand All @@ -390,7 +402,7 @@ omit =
homeassistant/components/sensor/bom.py
homeassistant/components/sensor/broadlink.py
homeassistant/components/sensor/buienradar.py
homeassistant/components/sensor/dublin_bus_transport.py
homeassistant/components/sensor/citybikes.py
homeassistant/components/sensor/coinmarketcap.py
homeassistant/components/sensor/cert_expiry.py
homeassistant/components/sensor/comed_hourly_pricing.py
Expand All @@ -404,6 +416,7 @@ omit =
homeassistant/components/sensor/dnsip.py
homeassistant/components/sensor/dovado.py
homeassistant/components/sensor/dte_energy_bridge.py
homeassistant/components/sensor/dublin_bus_transport.py
homeassistant/components/sensor/ebox.py
homeassistant/components/sensor/eddystone_temperature.py
homeassistant/components/sensor/eliqonline.py
Expand Down Expand Up @@ -450,6 +463,7 @@ omit =
homeassistant/components/sensor/openexchangerates.py
homeassistant/components/sensor/opensky.py
homeassistant/components/sensor/openweathermap.py
homeassistant/components/sensor/otp.py
homeassistant/components/sensor/pi_hole.py
homeassistant/components/sensor/plex.py
homeassistant/components/sensor/pocketcasts.py
Expand Down Expand Up @@ -511,6 +525,7 @@ omit =
homeassistant/components/switch/tplink.py
homeassistant/components/switch/transmission.py
homeassistant/components/switch/wake_on_lan.py
homeassistant/components/switch/xiaomi_vacuum.py
homeassistant/components/telegram_bot/*
homeassistant/components/thingspeak.py
homeassistant/components/tts/amazon_polly.py
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ matrix:
env: TOXENV=py35
- python: "3.6"
env: TOXENV=py36
- python: "3.6-dev"
env: TOXENV=py36
# - python: "3.6-dev"
# env: TOXENV=py36
- python: "3.4.2"
env: TOXENV=requirements
# allow_failures:
Expand Down
41 changes: 41 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# People marked here will be automatically requested for a review
# when the code that they own is touched.
# https://github.com/blog/2392-introducing-code-owners

setup.py @home-assistant/core
homeassistant/*.py @home-assistant/core
homeassistant/helpers/* @home-assistant/core
homeassistant/util/* @home-assistant/core
homeassistant/components/api.py @home-assistant/core
homeassistant/components/automation/* @home-assistant/core
homeassistant/components/configurator.py @home-assistant/core
homeassistant/components/group.py @home-assistant/core
homeassistant/components/history.py @home-assistant/core
homeassistant/components/http/* @home-assistant/core
homeassistant/components/input_*.py @home-assistant/core
homeassistant/components/introduction.py @home-assistant/core
homeassistant/components/logger.py @home-assistant/core
homeassistant/components/mqtt/* @home-assistant/core
homeassistant/components/panel_custom.py @home-assistant/core
homeassistant/components/panel_iframe.py @home-assistant/core
homeassistant/components/persistent_notification.py @home-assistant/core
homeassistant/components/scene/__init__.py @home-assistant/core
homeassistant/components/scene/hass.py @home-assistant/core
homeassistant/components/script.py @home-assistant/core
homeassistant/components/shell_command.py @home-assistant/core
homeassistant/components/sun.py @home-assistant/core
homeassistant/components/updater.py @home-assistant/core
homeassistant/components/weblink.py @home-assistant/core
homeassistant/components/websocket_api.py @home-assistant/core
homeassistant/components/zone.py @home-assistant/core

Dockerfile @home-assistant/docker
virtualization/Docker/* @home-assistant/docker

homeassistant/components/zwave/* @home-assistant/z-wave
homeassistant/components/*/zwave.py @home-assistant/z-wave

# Indiviudal components
homeassistant/components/cover/template.py @PhracturedBlue
homeassistant/components/device_tracker/automatic.py @armills
homeassistant/components/media_player/kodi.py @armills
4 changes: 2 additions & 2 deletions homeassistant/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ def cmdline() -> List[str]:
os.environ['PYTHONPATH'] = os.path.dirname(modulepath)
return [sys.executable] + [arg for arg in sys.argv if
arg != '--daemon']
else:
return [arg for arg in sys.argv if arg != '--daemon']

return [arg for arg in sys.argv if arg != '--daemon']


def setup_and_run_hass(config_dir: str,
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ def is_on(hass, entity_id=None):
else:
entity_ids = hass.states.entity_ids()

for entity_id in entity_ids:
domain = ha.split_entity_id(entity_id)[0]
for ent_id in entity_ids:
domain = ha.split_entity_id(ent_id)[0]

module = get_component(domain)

try:
if module.is_on(hass, entity_id):
if module.is_on(hass, ent_id):
return True

except AttributeError:
# module is None or method is_on does not exist
_LOGGER.exception("Failed to call %s.is_on for %s",
module, entity_id)
module, ent_id)

return False

Expand Down
3 changes: 1 addition & 2 deletions homeassistant/components/alarm_control_panel/alarmdotcom.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ def state(self):
return STATE_ALARM_ARMED_HOME
elif self._alarm.state.lower() == 'armed away':
return STATE_ALARM_ARMED_AWAY
else:
return STATE_UNKNOWN
return STATE_UNKNOWN

@asyncio.coroutine
def async_alarm_disarm(self, code=None):
Expand Down
3 changes: 1 addition & 2 deletions homeassistant/components/alarm_control_panel/envisalink.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ def code_format(self):
"""Regex for code format or None if no code is required."""
if self._code:
return None
else:
return '^\\d{4,6}$'
return '^\\d{4,6}$'

@property
def state(self):
Expand Down
3 changes: 1 addition & 2 deletions homeassistant/components/alarm_control_panel/manual.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ def state(self):
self._trigger_time) < dt_util.utcnow():
if self._disarm_after_trigger:
return STATE_ALARM_DISARMED
else:
return self._pre_trigger_state
return self._pre_trigger_state

return self._state

Expand Down
3 changes: 1 addition & 2 deletions homeassistant/components/alarm_control_panel/simplisafe.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ def name(self):
"""Return the name of the device."""
if self._name is not None:
return self._name
else:
return 'Alarm {}'.format(self.simplisafe.location_id())
return 'Alarm {}'.format(self.simplisafe.location_id())

@property
def code_format(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN,
CONF_NAME)

REQUIREMENTS = ['total_connect_client==0.7']
REQUIREMENTS = ['total_connect_client==0.11']

_LOGGER = logging.getLogger(__name__)

Expand Down
4 changes: 0 additions & 4 deletions homeassistant/components/alarm_control_panel/wink.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class WinkCameraDevice(WinkDevice, alarm.AlarmControlPanel):
"""Representation a Wink camera alarm."""

def __init__(self, wink, hass):
"""Initialize the Wink alarm."""
super().__init__(wink, hass)

@asyncio.coroutine
def async_added_to_hass(self):
"""Callback when entity is added to hass."""
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/alert.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,14 @@ def _notify_done_message(self, *args):
'notify', target, {'message': self._done_message})

@asyncio.coroutine
def async_turn_on(self):
def async_turn_on(self, **kwargs):
"""Async Unacknowledge alert."""
_LOGGER.debug("Reset Alert: %s", self._name)
self._ack = False
yield from self.async_update_ha_state()

@asyncio.coroutine
def async_turn_off(self):
def async_turn_off(self, **kwargs):
"""Async Acknowledge alert."""
_LOGGER.debug("Acknowledged Alert: %s", self._name)
self._ack = True
Expand Down
Loading

0 comments on commit dc08852

Please sign in to comment.