fix(typing): master broken due to new typing rules/deps.

homeassistant_cli/plugins/area.py

@@ -73,8 +73,11 @@ def create(ctx, names):
 
 
 @cli.command('delete')
-@click.argument(  # type: ignore
-    'names', nargs=-1, required=True, autocompletion=autocompletion.areas
+@click.argument(
+    'names',
+    nargs=-1,
+    required=True,
+    autocompletion=autocompletion.areas,  # type: ignore
 )
 @pass_context
 def delete(ctx, names):
@@ -108,8 +111,10 @@ def delete(ctx, names):
 
 
 @cli.command('rename')
-@click.argument(  # type: ignore
-    'oldname', required=True, autocompletion=autocompletion.areas
+@click.argument(
+    'oldname',
+    required=True,
+    autocompletion=autocompletion.areas,  # type: ignore
 )
 @click.argument('newname', required=True)
 @pass_context

homeassistant_cli/plugins/device.py

@@ -56,8 +56,10 @@ def listcmd(ctx: Configuration, devicefilter: str):
 
 
 @cli.command('assign')
-@click.argument(  # type: ignore
-    'area_id_or_name', required=True, autocompletion=autocompletion.areas
+@click.argument(
+    'area_id_or_name',
+    required=True,
+    autocompletion=autocompletion.areas,  # type: ignore
 )
 @click.argument('names', nargs=-1, required=False)
 @click.option(
@@ -98,12 +100,13 @@ def assign(
                     result.append(device)
 
     for id_or_name in names:
-        device = next(  # type: ignore
-            (x for x in devices if x['id'] == id_or_name), None
+        device = next(
+            (x for x in devices if x['id'] == id_or_name), None  # type: ignore
         )
         if not device:
-            device = next(  # type: ignore
-                (x for x in devices if x['name'] == id_or_name), None
+            device = next(
+                (x for x in devices if x['name'] == id_or_name),
+                None,  # type: ignore
             )
         if not device:
             _LOGGING.error(

homeassistant_cli/plugins/entity.py

@@ -58,12 +58,16 @@ def listcmd(ctx: Configuration, entityfilter: str):
 
 
 @cli.command('rename')
-@click.argument(  # type: ignore
-    'oldid', required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'oldid',
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @click.option('--name', required=False)
-@click.argument(  # type: ignore
-    'newid', required=False, autocompletion=autocompletion.entities
+@click.argument(
+    'newid',
+    required=False,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def rename(ctx, oldid, newid, name):

homeassistant_cli/plugins/event.py

@@ -21,8 +21,10 @@ def cli(ctx):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'event', required=True, autocompletion=autocompletion.events
+@click.argument(
+    'event',
+    required=True,
+    autocompletion=autocompletion.events,  # type: ignore
 )
 @click.option(
     '--json',

homeassistant_cli/plugins/map.py

@@ -20,8 +20,10 @@
 
 
 @click.command('map')
-@click.argument(  # type: ignore
-    'entity', required=False, autocompletion=autocompletion.entities
+@click.argument(
+    'entity',
+    required=False,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @click.option(
     '--service', default='openstreetmap', type=click.Choice(SERVICE.keys())

homeassistant_cli/plugins/raw.py

@@ -41,8 +41,8 @@ def _report(ctx, cmd, method, response) -> None:
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'method', autocompletion=autocompletion.api_methods
+@click.argument(
+    'method', autocompletion=autocompletion.api_methods  # type: ignore
 )
 @pass_context
 def get(ctx: Configuration, method):
@@ -53,8 +53,8 @@ def get(ctx: Configuration, method):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'method', autocompletion=autocompletion.api_methods
+@click.argument(
+    'method', autocompletion=autocompletion.api_methods  # type: ignore
 )
 @click.option('--json')
 @pass_context
@@ -71,8 +71,8 @@ def post(ctx: Configuration, method, json):
 
 
 @cli.command("ws")
-@click.argument(  # type: ignore
-    'wstype', autocompletion=autocompletion.wsapi_methods
+@click.argument(
+    'wstype', autocompletion=autocompletion.wsapi_methods  # type: ignore
 )
 @click.option('--json')
 @pass_context

homeassistant_cli/plugins/service.py

@@ -76,8 +76,10 @@ def list_cmd(ctx: Configuration, servicefilter):
 
 
 @cli.command('call')
-@click.argument(  # type: ignore
-    'service', required=True, autocompletion=autocompletion.services
+@click.argument(
+    'service',
+    required=True,
+    autocompletion=autocompletion.services,  # type: ignore
 )
 @click.option(
     '--arguments', help="Comma separated key/value pairs to use as arguments."

homeassistant_cli/plugins/state.py

@@ -23,8 +23,10 @@ def cli(ctx):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'entity', required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entity',
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def get(ctx: Configuration, entity):
@@ -45,8 +47,10 @@ def get(ctx: Configuration, entity):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'entity', required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entity',
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def delete(ctx: Configuration, entity):
@@ -87,8 +91,10 @@ def listcmd(ctx, entityfilter):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'entity', required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entity',
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @click.argument('newstate', required=False)
 @click.option(
@@ -194,8 +200,11 @@ def _homeassistant_cmd(ctx: Configuration, entities, cmd, action):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'entities', nargs=-1, required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entities',
+    nargs=-1,
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def toggle(ctx: Configuration, entities):
@@ -205,8 +214,11 @@ def toggle(ctx: Configuration, entities):
 
 
 @cli.command('turn_off')
-@click.argument(  # type: ignore
-    'entities', nargs=-1, required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entities',
+    nargs=-1,
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def off_cmd(ctx: Configuration, entities):
@@ -216,8 +228,11 @@ def off_cmd(ctx: Configuration, entities):
 
 
 @cli.command('turn_on')
-@click.argument(  # type: ignore
-    'entities', nargs=-1, required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entities',
+    nargs=-1,
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @pass_context
 def on_cmd(ctx: Configuration, entities):
@@ -227,8 +242,11 @@ def on_cmd(ctx: Configuration, entities):
 
 
 @cli.command()
-@click.argument(  # type: ignore
-    'entities', nargs=-1, required=True, autocompletion=autocompletion.entities
+@click.argument(
+    'entities',
+    nargs=-1,
+    required=True,
+    autocompletion=autocompletion.entities,  # type: ignore
 )
 @click.option(
     '--since',

mypyrc

@@ -1,2 +1,3 @@
 homeassistant_cli
-tests
+homeassistant_cli/plugins
+tests

tests/test_completion.py

@@ -1,8 +1,11 @@
 """Tests file for Home Assistant CLI (hass-cli)."""
+from typing import cast
+
 import requests_mock
 
 import homeassistant_cli.autocompletion as autocompletion
 import homeassistant_cli.cli as cli
+from homeassistant_cli.config import Configuration
 
 
 def test_entity_completion(basic_entities_text) -> None:
@@ -15,8 +18,8 @@ def test_entity_completion(basic_entities_text) -> None:
         )
 
         cfg = cli.cli.make_context('hass-cli', ['entity', 'get'])
-        result = autocompletion.entities(  # type: ignore
-            cfg, ["entity", "get"], ""
+        result = autocompletion.entities(
+            cast(cfg, Configuration), ["entity", "get"], ""  # type: ignore
         )
         assert len(result) == 3
 
@@ -37,8 +40,8 @@ def test_service_completion(default_services_text) -> None:
 
         cfg = cli.cli.make_context('hass-cli', ['service', 'list'])
 
-        result = autocompletion.services(  # type: ignore
-            cfg, ["service", "list"], ""
+        result = autocompletion.services(
+            cfg, ["service", "list"], ""  # type: ignore
         )
         assert len(result) == 12
 
@@ -60,8 +63,8 @@ def test_event_completion(default_events_text) -> None:
 
         cfg = cli.cli.make_context('hass-cli', ['events', 'list'])
 
-        result = autocompletion.events(  # type: ignore
-            cfg, ["events", "list"], ""
+        result = autocompletion.events(
+            cfg, ["events", "list"], ""  # type: ignore
         )
         assert len(result) == 11
 
@@ -82,8 +85,8 @@ def test_area_completion(default_events_text) -> None:
 
         cfg = cli.cli.make_context('hass-cli', ['events', 'list'])
 
-        result = autocompletion.events(  # type: ignore
-            cfg, ["events", "list"], ""
+        result = autocompletion.events(
+            cfg, ["events", "list"], ""  # type: ignore
         )
         assert len(result) == 11
 

tox.ini

@@ -12,7 +12,7 @@ setenv =
 whitelist_externals = /usr/bin/env
 install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
-     pytest --timeout=9 --duration=10 {posargs}
+     pytest --timeout=9 --durations=10 {posargs}
      {toxinidir}/script/check_dirty
 deps =
      -r{toxinidir}/requirements_test_all.txt
@@ -31,7 +31,7 @@ setenv =
 whitelist_externals = /usr/bin/env
 install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
-     pytest --timeout=9 --duration=10 --cov --cov-report= {posargs}
+     pytest --timeout=9 --durations=10 --cov --cov-report= {posargs}
      {toxinidir}/script/check_dirty
 deps =
      -r{toxinidir}/requirements_test_all.txt