Revert "Merge branch 'dev' of https://github.com/marcogazzola/home-as…

…sistant into dev"

This reverts commit e1f370b.

.github/PULL_REQUEST_TEMPLATE.md

@@ -27,5 +27,5 @@ If the code communicates with devices, web services, or third-party tools:
 If the code does not interact with devices:
   - [ ] Tests have been added to verify that the new code works.
 
-[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard/__init__.py#L14
-[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard/__init__.py#L23
+[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L14
+[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L54

.gitignore

@@ -78,7 +78,6 @@ venv
 .venv
 Pipfile*
 share/*
-Scripts/
 
 # vimmy stuff
 *.swp

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+multi_line_output=4

CODEOWNERS

@@ -7,34 +7,34 @@ setup.py @home-assistant/core
 homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
-homeassistant/components/api/* @home-assistant/core
+homeassistant/components/api.py @home-assistant/core
 homeassistant/components/auth/* @home-assistant/core
 homeassistant/components/automation/* @home-assistant/core
 homeassistant/components/cloud/* @home-assistant/core
 homeassistant/components/config/* @home-assistant/core
-homeassistant/components/configurator/* @home-assistant/core
+homeassistant/components/configurator.py @home-assistant/core
 homeassistant/components/conversation/* @home-assistant/core
 homeassistant/components/frontend/* @home-assistant/core
 homeassistant/components/group/* @home-assistant/core
-homeassistant/components/history/* @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/* @home-assistant/core
-homeassistant/components/logger/* @home-assistant/core
+homeassistant/components/introduction.py @home-assistant/core
+homeassistant/components/logger.py @home-assistant/core
 homeassistant/components/lovelace/* @home-assistant/core
 homeassistant/components/mqtt/* @home-assistant/core
-homeassistant/components/panel_custom/* @home-assistant/core
-homeassistant/components/panel_iframe/* @home-assistant/core
+homeassistant/components/panel_custom.py @home-assistant/core
+homeassistant/components/panel_iframe.py @home-assistant/core
 homeassistant/components/onboarding/* @home-assistant/core
 homeassistant/components/persistent_notification/* @home-assistant/core
 homeassistant/components/scene/__init__.py @home-assistant/core
 homeassistant/components/scene/hass.py @home-assistant/core
-homeassistant/components/script/* @home-assistant/core
-homeassistant/components/shell_command/* @home-assistant/core
-homeassistant/components/sun/* @home-assistant/core
-homeassistant/components/updater/* @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/* @home-assistant/core
-homeassistant/components/websocket_api/* @home-assistant/core
+homeassistant/components/websocket_api.py @home-assistant/core
 homeassistant/components/zone/* @home-assistant/core
 
 # Home Assistant Developer Teams
@@ -53,7 +53,6 @@ homeassistant/components/binary_sensor/hikvision.py @mezz64
 homeassistant/components/binary_sensor/threshold.py @fabaff
 homeassistant/components/binary_sensor/uptimerobot.py @ludeeus
 homeassistant/components/camera/yi.py @bachya
-homeassistant/components/climate/coolmaster.py @OnFreund
 homeassistant/components/climate/ephember.py @ttroy50
 homeassistant/components/climate/eq3btsmart.py @rytilahti
 homeassistant/components/climate/mill.py @danielhiversen
@@ -63,17 +62,23 @@ homeassistant/components/cover/group.py @cdce8p
 homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/asuswrt.py @kennedyshead
 homeassistant/components/device_tracker/automatic.py @armills
+homeassistant/components/device_tracker/googlehome.py @ludeeus
 homeassistant/components/device_tracker/huawei_router.py @abmantis
 homeassistant/components/device_tracker/quantum_gateway.py @cisasteelersfan
 homeassistant/components/device_tracker/tile.py @bachya
 homeassistant/components/device_tracker/traccar.py @ludeeus
 homeassistant/components/device_tracker/bt_smarthub.py @jxwolstenholme
 <<<<<<< HEAD
+<<<<<<< HEAD
 homeassistant/components/device_tracker/synology_srm.py @aerialls
 =======
 >>>>>>> Merge branch 'dev' of https://github.com/marcogazzola/home-assistant into dev
 homeassistant/components/history_graph/* @andrey-git
 homeassistant/components/influx/* @fabaff
+=======
+homeassistant/components/history_graph.py @andrey-git
+homeassistant/components/influx.py @fabaff
+>>>>>>> Revert "Merge branch 'dev' of https://github.com/marcogazzola/home-assistant into dev"
 homeassistant/components/light/lifx_legacy.py @amelchio
 homeassistant/components/light/tplink.py @rytilahti
 homeassistant/components/light/yeelight.py @rytilahti
@@ -89,7 +94,7 @@ homeassistant/components/media_player/mpd.py @fabaff
 homeassistant/components/media_player/sonos.py @amelchio
 homeassistant/components/media_player/xiaomi_tv.py @fattdev
 homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
-homeassistant/components/no_ip/* @fabaff
+homeassistant/components/no_ip.py @fabaff
 homeassistant/components/notify/file.py @fabaff
 homeassistant/components/notify/flock.py @fabaff
 homeassistant/components/notify/instapush.py @fabaff
@@ -98,8 +103,7 @@ homeassistant/components/notify/smtp.py @fabaff
 homeassistant/components/notify/syslog.py @fabaff
 homeassistant/components/notify/xmpp.py @fabaff
 homeassistant/components/notify/yessssms.py @flowolf
-homeassistant/components/plant/* @ChristianKuehnel
-homeassistant/components/remote/harmony.py @ehendrix23
+homeassistant/components/plant.py @ChristianKuehnel
 homeassistant/components/scene/lifx_cloud.py @amelchio
 homeassistant/components/sensor/airvisual.py @bachya
 homeassistant/components/sensor/alpha_vantage.py @fabaff
@@ -144,8 +148,8 @@ homeassistant/components/sensor/time_data.py @fabaff
 homeassistant/components/sensor/version.py @fabaff
 homeassistant/components/sensor/waqi.py @andrey-git
 homeassistant/components/sensor/worldclock.py @fabaff
-homeassistant/components/shiftr/* @fabaff
-homeassistant/components/spaceapi/* @fabaff
+homeassistant/components/shiftr.py @fabaff
+homeassistant/components/spaceapi.py @fabaff
 homeassistant/components/switch/switchbot.py @danielhiversen
 homeassistant/components/switch/switchmate.py @danielhiversen
 homeassistant/components/switch/tplink.py @rytilahti
@@ -155,141 +159,139 @@ homeassistant/components/weather/darksky.py @fabaff
 homeassistant/components/weather/demo.py @fabaff
 homeassistant/components/weather/met.py @danielhiversen
 homeassistant/components/weather/openweathermap.py @fabaff
-homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
+homeassistant/components/xiaomi_aqara.py @danielhiversen @syssi
 
 # A
-homeassistant/components/ambient_station/* @bachya
-homeassistant/components/arduino/* @fabaff
+homeassistant/components/arduino.py @fabaff
 homeassistant/components/*/arduino.py @fabaff
 homeassistant/components/*/arest.py @fabaff
 homeassistant/components/*/axis.py @kane610
 
 # B
 homeassistant/components/blink/* @fronzbot
 homeassistant/components/*/blink.py @fronzbot
-homeassistant/components/bmw_connected_drive/* @ChristianKuehnel
+homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/broadlink.py @danielhiversen
 
 # C
-homeassistant/components/cloudflare/* @ludeeus
+homeassistant/components/cloudflare.py @ludeeus
 homeassistant/components/counter/* @fabaff
 
 # D
-homeassistant/components/daikin/* @fredrike @rofrantz
+homeassistant/components/daikin.py @fredrike @rofrantz
 homeassistant/components/*/daikin.py @fredrike @rofrantz
 homeassistant/components/*/deconz.py @kane610
-homeassistant/components/digital_ocean/* @fabaff
+homeassistant/components/digital_ocean.py @fabaff
 homeassistant/components/*/digital_ocean.py @fabaff
-homeassistant/components/dweet/* @fabaff
+homeassistant/components/dweet.py @fabaff
 homeassistant/components/*/dweet.py @fabaff
 
 # E
-homeassistant/components/ecovacs/* @OverloadUT
+homeassistant/components/ecovacs.py @OverloadUT
 homeassistant/components/*/ecovacs.py @OverloadUT
 homeassistant/components/*/edp_redy.py @abmantis
-homeassistant/components/edp_redy/* @abmantis
-homeassistant/components/eight_sleep/* @mezz64
+homeassistant/components/edp_redy.py @abmantis
+homeassistant/components/eight_sleep.py @mezz64
 homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/esphome/*.py @OttoWinter
-
-# G
-homeassistant/components/googlehome/* @ludeeus
-homeassistant/components/*/googlehome.py @ludeeus
+homeassistant/components/*/esphome.py @OttoWinter
 
 # H
-homeassistant/components/hive/* @Rendili @KJonline
+homeassistant/components/hive.py @Rendili @KJonline
 homeassistant/components/*/hive.py @Rendili @KJonline
 homeassistant/components/homekit/* @cdce8p
-homeassistant/components/huawei_lte/* @scop
+homeassistant/components/huawei_lte.py @scop
 homeassistant/components/*/huawei_lte.py @scop
 
-# I
-homeassistant/components/ipma/* @dgomes
-
 # K
-homeassistant/components/knx/* @Julius2342
+homeassistant/components/knx.py @Julius2342
 homeassistant/components/*/knx.py @Julius2342
-homeassistant/components/konnected/* @heythisisnate
+homeassistant/components/konnected.py @heythisisnate
 homeassistant/components/*/konnected.py @heythisisnate
 
 # L
-homeassistant/components/lifx/* @amelchio
+homeassistant/components/lifx.py @amelchio
 homeassistant/components/*/lifx.py @amelchio
 homeassistant/components/luftdaten/* @fabaff
 homeassistant/components/*/luftdaten.py @fabaff
 
 # M
-homeassistant/components/matrix/* @tinloaf
+homeassistant/components/matrix.py @tinloaf
 homeassistant/components/*/matrix.py @tinloaf
-homeassistant/components/melissa/* @kennedyshead
+homeassistant/components/melissa.py @kennedyshead
 homeassistant/components/*/melissa.py @kennedyshead
 homeassistant/components/*/mystrom.py @fabaff
 
 # N
-homeassistant/components/ness_alarm/* @nickw444
+homeassistant/components/ness_alarm.py @nickw444
 homeassistant/components/*/ness_alarm.py @nickw444
-homeassistant/components/nissan_leaf/* @filcole
 
 # O
 homeassistant/components/openuv/* @bachya
+homeassistant/components/*/openuv.py @bachya
 
 # P
 homeassistant/components/point/* @fredrike
 homeassistant/components/*/point.py @fredrike
 
 # Q
-homeassistant/components/qwikswitch/* @kellerza
+homeassistant/components/qwikswitch.py @kellerza
 homeassistant/components/*/qwikswitch.py @kellerza
 
 # R
 homeassistant/components/rainmachine/* @bachya
+homeassistant/components/*/rainmachine.py @bachya
 homeassistant/components/*/random.py @fabaff
 homeassistant/components/*/rfxtrx.py @danielhiversen
 
 # S
 homeassistant/components/simplisafe/* @bachya
-homeassistant/components/smartthings/* @andrewsayre
-homeassistant/components/spider/* @peternijssen
+homeassistant/components/*/simplisafe.py @bachya
 
 # T
-homeassistant/components/tahoma/* @philklei
+homeassistant/components/tahoma.py @philklei
 homeassistant/components/*/tahoma.py @philklei
 homeassistant/components/tellduslive/*.py @fredrike
 homeassistant/components/*/tellduslive.py @fredrike
-homeassistant/components/tesla/* @zabuldon
+homeassistant/components/tesla.py @zabuldon
 homeassistant/components/*/tesla.py @zabuldon
-homeassistant/components/thethingsnetwork/* @fabaff
+homeassistant/components/thethingsnetwork.py @fabaff
 homeassistant/components/*/thethingsnetwork.py @fabaff
 homeassistant/components/tibber/* @danielhiversen
 homeassistant/components/*/tibber.py @danielhiversen
 homeassistant/components/tradfri/* @ggravlingen
 homeassistant/components/*/tradfri.py @ggravlingen
 
 # U
-homeassistant/components/unifi/* @kane610
+homeassistant/components/unifi.py @kane610
 homeassistant/components/switch/unifi.py @kane610
+<<<<<<< HEAD
 homeassistant/components/upcloud/* @scop
 <<<<<<< HEAD
 homeassistant/components/utility_meter/* @dgomes
 =======
 >>>>>>> Merge branch 'dev' of https://github.com/marcogazzola/home-assistant into dev
+=======
+homeassistant/components/upcloud.py @scop
+>>>>>>> Revert "Merge branch 'dev' of https://github.com/marcogazzola/home-assistant into dev"
 homeassistant/components/*/upcloud.py @scop
 
 # V
-homeassistant/components/velux/* @Julius2342
+homeassistant/components/velux.py @Julius2342
 homeassistant/components/*/velux.py @Julius2342
 
 # W
-homeassistant/components/wemo/* @sqldiablo
+homeassistant/components/wemo.py @sqldiablo
 homeassistant/components/*/wemo.py @sqldiablo
 
 # X
 homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi
 homeassistant/components/*/xiaomi_miio.py @rytilahti @syssi
 
 # Z
-homeassistant/components/zoneminder/* @rohankapoorcom
+homeassistant/components/zoneminder/ @rohankapoorcom
+homeassistant/components/*/zoneminder.py @rohankapoorcom
 
 # Other code
 homeassistant/scripts/check_config.py @kellerza

Dockerfile

@@ -2,7 +2,7 @@
 # When updating this file, please also update virtualization/Docker/Dockerfile.dev
 # This way, the development image and the production image are kept in sync.
 
-FROM python:3.7
+FROM python:3.6
 LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
 
 # Uncomment any of the following lines to disable the installation.
@@ -16,6 +16,7 @@ LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
 
 VOLUME /config
 
+RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Copy build scripts
@@ -27,7 +28,7 @@ COPY requirements_all.txt requirements_all.txt
 # Uninstall enum34 because some dependencies install it but breaks Python 3.4+.
 # See PR #8103 for more info.
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop==0.11.3 cchardet cython tensorflow
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop cchardet cython tensorflow
 
 # Copy source
 COPY . .