Sort imports according to PEP8 for 'script' folder (#29790)

script/gen_requirements_all.py

@@ -8,10 +8,10 @@ import pkgutil
 import re
 import sys
 
-from homeassistant.util.yaml.loader import load_yaml
-
 from script.hassfest.model import Integration
 
+from homeassistant.util.yaml.loader import load_yaml
+
 COMMENT_REQUIREMENTS = (
     "Adafruit_BBIO",
     "Adafruit-DHT",

script/hassfest/__main__.py

@@ -2,8 +2,8 @@
 import pathlib
 import sys
 
-from .model import Integration, Config
 from . import codeowners, config_flow, dependencies, manifest, services, ssdp, zeroconf
+from .model import Config, Integration
 
 PLUGINS = [codeowners, config_flow, dependencies, manifest, services, ssdp, zeroconf]
 

script/hassfest/codeowners.py

@@ -1,7 +1,7 @@
 """Generate CODEOWNERS."""
 from typing import Dict
 
-from .model import Integration, Config
+from .model import Config, Integration
 
 BASE = """
 # This file is generated by script/hassfest/codeowners.py

script/hassfest/config_flow.py

@@ -2,7 +2,7 @@
 import json
 from typing import Dict
 
-from .model import Integration, Config
+from .model import Config, Integration
 
 BASE = """
 \"\"\"Automatically generated by hassfest.

script/hassfest/dependencies.py

@@ -1,7 +1,7 @@
 """Validate dependencies."""
 import pathlib
 import re
-from typing import Set, Dict
+from typing import Dict, Set
 
 from .model import Integration
 

script/hassfest/manifest.py

@@ -6,7 +6,6 @@ from voluptuous.humanize import humanize_error
 
 from .model import Integration
 
-
 MANIFEST_SCHEMA = vol.Schema(
     {
         vol.Required("domain"): str,

script/hassfest/manifest_helper.py

@@ -2,7 +2,6 @@
 import json
 import pathlib
 
-
 component_dir = pathlib.Path("homeassistant/components")
 
 

script/hassfest/model.py

@@ -1,8 +1,8 @@
 """Models for manifest validator."""
-import json
-from typing import List, Dict, Any
-import pathlib
 import importlib
+import json
+import pathlib
+from typing import Any, Dict, List
 
 import attr
 

script/hassfest/services.py

@@ -1,8 +1,8 @@
 """Validate dependencies."""
 import pathlib
+import re
 from typing import Dict
 
-import re
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 

script/hassfest/ssdp.py

@@ -3,7 +3,7 @@ from collections import OrderedDict, defaultdict
 import json
 from typing import Dict
 
-from .model import Integration, Config
+from .model import Config, Integration
 
 BASE = """
 \"\"\"Automatically generated by hassfest.

script/hassfest/zeroconf.py

@@ -3,7 +3,7 @@ from collections import OrderedDict, defaultdict
 import json
 from typing import Dict
 
-from .model import Integration, Config
+from .model import Config, Integration
 
 BASE = """
 \"\"\"Automatically generated by hassfest.

script/inspect_schemas.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Inspect all component SCHEMAS."""
-import os
 import importlib
+import os
 import pkgutil
 
 from homeassistant.config import _identify_config_schema

script/lazytox.py

@@ -4,12 +4,12 @@ Lazy 'tox' to quickly check if branch is up to PR standards.
 
 This is NOT a tox replacement, only a quick check during development.
 """
-import os
 import asyncio
-import sys
+from collections import namedtuple
+import os
 import re
 import shlex
-from collections import namedtuple
+import sys
 
 try:
     from colorlog.escape_codes import escape_codes

script/scaffold/__main__.py

@@ -4,10 +4,9 @@ from pathlib import Path
 import subprocess
 import sys
 
-from . import gather_info, generate, error, docs
+from . import docs, error, gather_info, generate
 from .const import COMPONENT_DIR
 
-
 TEMPLATES = [
     p.name for p in (Path(__file__).parent / "templates").glob("*") if p.is_dir()
 ]

script/scaffold/docs.py

@@ -1,7 +1,6 @@
 """Print links to relevant docs."""
 from .model import Info
 
-
 DATA = {
     "config_flow": {
         "title": "Config Flow",

script/scaffold/gather_info.py

@@ -4,9 +4,8 @@ import json
 from homeassistant.util import slugify
 
 from .const import COMPONENT_DIR
-from .model import Info
 from .error import ExitApp
-
+from .model import Info
 
 CHECK_EMPTY = ["Cannot be empty", lambda value: value]
 

script/scaffold/templates/config_flow/integration/__init__.py

@@ -3,8 +3,8 @@ import asyncio
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
 

script/scaffold/templates/config_flow/integration/config_flow.py

@@ -3,7 +3,7 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant import core, config_entries, exceptions
+from homeassistant import config_entries, core, exceptions
 
 from .const import DOMAIN  # pylint:disable=unused-import
 

script/scaffold/templates/config_flow/tests/test_config_flow.py

@@ -2,8 +2,8 @@
 from unittest.mock import patch
 
 from homeassistant import config_entries, setup
-from homeassistant.components.NEW_DOMAIN.const import DOMAIN
 from homeassistant.components.NEW_DOMAIN.config_flow import CannotConnect, InvalidAuth
+from homeassistant.components.NEW_DOMAIN.const import DOMAIN
 
 from tests.common import mock_coro
 

script/scaffold/templates/config_flow_discovery/integration/__init__.py

@@ -3,8 +3,8 @@ import asyncio
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
 

script/scaffold/templates/config_flow_discovery/integration/config_flow.py

@@ -1,8 +1,9 @@
 """Config flow for NEW_NAME."""
 import my_pypi_dependency
 
-from homeassistant.helpers import config_entry_flow
 from homeassistant import config_entries
+from homeassistant.helpers import config_entry_flow
+
 from .const import DOMAIN
 
 

script/scaffold/templates/config_flow_oauth2/integration/__init__.py

@@ -3,17 +3,17 @@ import asyncio
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
-from homeassistant.helpers import (
-    config_validation as cv,
-    config_entry_oauth2_flow,
-    aiohttp_client,
-)
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_entry_oauth2_flow,
+    config_validation as cv,
+)
 
-from .const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 from . import api, config_flow
+from .const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 
 CONFIG_SCHEMA = vol.Schema(
     {

script/scaffold/templates/config_flow_oauth2/integration/api.py

@@ -4,7 +4,7 @@ from asyncio import run_coroutine_threadsafe
 from aiohttp import ClientSession
 import my_pypi_package
 
-from homeassistant import core, config_entries
+from homeassistant import config_entries, core
 from homeassistant.helpers import config_entry_oauth2_flow
 
 # TODO the following two API examples are based on our suggested best practices

script/scaffold/templates/config_flow_oauth2/integration/config_flow.py

@@ -3,6 +3,7 @@ import logging
 
 from homeassistant import config_entries
 from homeassistant.helpers import config_entry_oauth2_flow
+
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)

script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py

@@ -1,5 +1,5 @@
 """Test the NEW_NAME config flow."""
-from homeassistant import config_entries, setup, data_entry_flow
+from homeassistant import config_entries, data_entry_flow, setup
 from homeassistant.components.NEW_DOMAIN.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,

script/scaffold/templates/device_action/integration/device_action.py

@@ -1,19 +1,21 @@
 """Provides device automations for NEW_NAME."""
-from typing import Optional, List
+from typing import List, Optional
+
 import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    CONF_DOMAIN,
-    CONF_TYPE,
     CONF_DEVICE_ID,
+    CONF_DOMAIN,
     CONF_ENTITY_ID,
-    SERVICE_TURN_ON,
+    CONF_TYPE,
     SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
 )
-from homeassistant.core import HomeAssistant, Context
+from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers import entity_registry
 import homeassistant.helpers.config_validation as cv
+
 from . import DOMAIN
 
 # TODO specify your supported action types.

script/scaffold/templates/device_action/tests/test_device_action.py

@@ -2,17 +2,17 @@
 import pytest
 
 from homeassistant.components.NEW_DOMAIN import DOMAIN
-from homeassistant.setup import async_setup_component
 import homeassistant.components.automation as automation
 from homeassistant.helpers import device_registry
+from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
     assert_lists_same,
+    async_get_device_automations,
     async_mock_service,
     mock_device_registry,
     mock_registry,
-    async_get_device_automations,
 )
 
 

script/scaffold/templates/device_condition/integration/device_condition.py

@@ -1,21 +1,23 @@
 """Provide the device automations for NEW_NAME."""
 from typing import Dict, List
+
 import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_CONDITION,
-    CONF_DOMAIN,
-    CONF_TYPE,
     CONF_DEVICE_ID,
+    CONF_DOMAIN,
     CONF_ENTITY_ID,
+    CONF_TYPE,
     STATE_OFF,
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import condition, config_validation as cv, entity_registry
-from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 from homeassistant.helpers.config_validation import DEVICE_CONDITION_BASE_SCHEMA
+from homeassistant.helpers.typing import ConfigType, TemplateVarsType
+
 from . import DOMAIN
 
 # TODO specify your supported condition types.

script/scaffold/templates/device_condition/tests/test_device_condition.py

@@ -2,18 +2,18 @@
 import pytest
 
 from homeassistant.components.NEW_DOMAIN import DOMAIN
-from homeassistant.const import STATE_ON, STATE_OFF
-from homeassistant.setup import async_setup_component
 import homeassistant.components.automation as automation
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.helpers import device_registry
+from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
     assert_lists_same,
+    async_get_device_automations,
     async_mock_service,
     mock_device_registry,
     mock_registry,
-    async_get_device_automations,
 )
 
 

script/scaffold/templates/device_trigger/integration/device_trigger.py

@@ -1,21 +1,23 @@
 """Provides device automations for NEW_NAME."""
 from typing import List
+
 import voluptuous as vol
 
+from homeassistant.components.automation import AutomationActionType, state
+from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA
 from homeassistant.const import (
-    CONF_DOMAIN,
-    CONF_TYPE,
-    CONF_PLATFORM,
     CONF_DEVICE_ID,
+    CONF_DOMAIN,
     CONF_ENTITY_ID,
-    STATE_ON,
+    CONF_PLATFORM,
+    CONF_TYPE,
     STATE_OFF,
+    STATE_ON,
 )
-from homeassistant.core import HomeAssistant, CALLBACK_TYPE
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_registry
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.components.automation import state, AutomationActionType
+
-from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA
 from . import DOMAIN
 
 # TODO specify your supported trigger types.

script/scaffold/templates/device_trigger/tests/test_device_trigger.py

@@ -2,18 +2,18 @@
 import pytest
 
 from homeassistant.components.NEW_DOMAIN import DOMAIN
-from homeassistant.const import STATE_ON, STATE_OFF
-from homeassistant.setup import async_setup_component
 import homeassistant.components.automation as automation
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.helpers import device_registry
+from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
     assert_lists_same,
+    async_get_device_automations,
     async_mock_service,
     mock_device_registry,
     mock_registry,
-    async_get_device_automations,
 )
 
 

script/scaffold/templates/integration/integration/__init__.py

@@ -5,7 +5,6 @@ from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
 
-
 CONFIG_SCHEMA = vol.Schema({vol.Optional(DOMAIN): {}}, extra=vol.ALLOW_EXTRA)
 
 

script/scaffold/templates/reproduce_state/integration/reproduce_state.py

@@ -5,10 +5,10 @@ from typing import Iterable, Optional
 
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    STATE_ON,
-    STATE_OFF,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
 )
 from homeassistant.core import Context, State
 from homeassistant.helpers.typing import HomeAssistantType

script/translations_download_split.py

@@ -4,7 +4,7 @@ import glob
 import json
 import os
 import re
-from typing import Union, List, Dict
+from typing import Dict, List, Union
 
 FILENAME_FORMAT = re.compile(r"strings\.(?P<suffix>\w+)\.json")
 

script/translations_upload_merge.py

@@ -5,7 +5,7 @@ import itertools
 import json
 import os
 import re
-from typing import Union, List, Dict
+from typing import Dict, List, Union
 
 FILENAME_FORMAT = re.compile(r"strings\.(?P<suffix>\w+)\.json")
 

script/version_bump.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 """Helper script to bump the current version."""
 import argparse
+from datetime import datetime
 import re
 import subprocess
-from datetime import datetime
 
 from packaging.version import Version