From 73f786c606dd3ad913e4d27553acd620548a0349 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:46:37 +1200
Subject: [PATCH] [code-quality] Organise script imports (#7198)

---
 script/build_codeowners.py      |  8 ++++----
 script/build_language_schema.py | 14 +++++++-------
 script/bump-version.py          |  2 +-
 script/clang-format             | 12 +++---------
 script/clang-tidy               | 29 ++++++++++++++---------------
 script/helpers.py               |  2 +-
 script/lint-python              | 19 ++++++++++---------
 script/list-components.py       |  9 +++++----
 8 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/script/build_codeowners.py b/script/build_codeowners.py
index 6bc558d351..db34ad7702 100755
--- a/script/build_codeowners.py
+++ b/script/build_codeowners.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
-from pathlib import Path
-import sys
 import argparse
 from collections import defaultdict
+from pathlib import Path
+import sys
 
-from esphome.helpers import write_file_if_changed
 from esphome.config import get_component, get_platform
-from esphome.core import CORE
 from esphome.const import KEY_CORE, KEY_TARGET_FRAMEWORK
+from esphome.core import CORE
+from esphome.helpers import write_file_if_changed
 
 parser = argparse.ArgumentParser()
 parser.add_argument(
diff --git a/script/build_language_schema.py b/script/build_language_schema.py
index cb3dc1832d..8b2c28b06b 100644
--- a/script/build_language_schema.py
+++ b/script/build_language_schema.py
@@ -1,9 +1,10 @@
+import argparse
+import glob
 import inspect
 import json
-import argparse
 import os
-import glob
 import re
+
 import voluptuous as vol
 
 # NOTE: Cannot import other esphome components globally as a modification in vol_schema
@@ -94,13 +95,12 @@ load_components()
 
 # Import esphome after loading components (so schema is tracked)
 # pylint: disable=wrong-import-position
-import esphome.core as esphome_core
-import esphome.config_validation as cv
-from esphome import automation
-from esphome import pins
+from esphome import automation, pins
 from esphome.components import remote_base
-from esphome.loader import get_platform, CORE_COMPONENTS_PATH
+import esphome.config_validation as cv
+import esphome.core as esphome_core
 from esphome.helpers import write_file_if_changed
+from esphome.loader import CORE_COMPONENTS_PATH, get_platform
 from esphome.util import Registry
 
 # pylint: enable=wrong-import-position
diff --git a/script/bump-version.py b/script/bump-version.py
index a55bb65cd6..8389d482b8 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 import argparse
-import re
 from dataclasses import dataclass
+import re
 import sys
 
 
diff --git a/script/clang-format b/script/clang-format
index b065d80795..d922c5b6f1 100755
--- a/script/clang-format
+++ b/script/clang-format
@@ -1,15 +1,6 @@
 #!/usr/bin/env python3
 
-from helpers import (
-    print_error_for_file,
-    get_output,
-    git_ls_files,
-    filter_changed,
-    get_binary,
-)
 import argparse
-import click
-import colorama
 import multiprocessing
 import os
 import queue
@@ -18,6 +9,9 @@ import subprocess
 import sys
 import threading
 
+import click
+import colorama
+from helpers import filter_changed, get_binary, git_ls_files, print_error_for_file
 
 
 def run_format(executable, args, queue, lock, failed_files):
diff --git a/script/clang-tidy b/script/clang-tidy
index bd919825fd..ea522157c5 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -1,21 +1,6 @@
 #!/usr/bin/env python3
 
-from helpers import (
-    print_error_for_file,
-    get_output,
-    filter_grep,
-    build_all_include,
-    temp_header_file,
-    git_ls_files,
-    filter_changed,
-    load_idedata,
-    root_path,
-    basepath,
-    get_binary,
-)
 import argparse
-import click
-import colorama
 import multiprocessing
 import os
 import queue
@@ -26,6 +11,20 @@ import sys
 import tempfile
 import threading
 
+import click
+import colorama
+from helpers import (
+    basepath,
+    build_all_include,
+    filter_changed,
+    filter_grep,
+    get_binary,
+    git_ls_files,
+    load_idedata,
+    print_error_for_file,
+    root_path,
+    temp_header_file,
+)
 
 
 def clang_options(idedata):
diff --git a/script/helpers.py b/script/helpers.py
index 52b0658fb6..56349b6052 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -1,8 +1,8 @@
 import json
 import os.path
+from pathlib import Path
 import re
 import subprocess
-from pathlib import Path
 
 import colorama
 
diff --git a/script/lint-python b/script/lint-python
index 7de1de80b0..01e5e76190 100755
--- a/script/lint-python
+++ b/script/lint-python
@@ -1,19 +1,20 @@
 #!/usr/bin/env python3
 
-from helpers import (
-    styled,
-    print_error_for_file,
-    get_output,
-    get_err,
-    git_ls_files,
-    filter_changed,
-)
 import argparse
-import colorama
 import os
 import re
 import sys
 
+import colorama
+from helpers import (
+    filter_changed,
+    get_err,
+    get_output,
+    git_ls_files,
+    print_error_for_file,
+    styled,
+)
+
 curfile = None
 
 
diff --git a/script/list-components.py b/script/list-components.py
index 559919bb8a..0d4777436b 100755
--- a/script/list-components.py
+++ b/script/list-components.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
+import argparse
 from pathlib import Path
 import sys
-import argparse
 
-from helpers import git_ls_files, changed_files
-from esphome.loader import get_component, get_platform
-from esphome.core import CORE
+from helpers import changed_files, git_ls_files
+
 from esphome.const import (
     KEY_CORE,
     KEY_TARGET_FRAMEWORK,
@@ -13,6 +12,8 @@ from esphome.const import (
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
 )
+from esphome.core import CORE
+from esphome.loader import get_component, get_platform
 
 
 def filter_component_files(str):