Deployment cleanup: isort and flake8

Task-number: PYSIDE-1612
Pick-to: 6.6
Change-Id: I620582409749b1ce1e36721f1308005c4f6d2828
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

12 files changed, 42 insertions, 37 deletions

diff --git a/sources/pyside-tools/android_deploy.py b/sources/pyside-tools/android_deploy.py
index 8c4f909db..8ac8aa510 100644
--- a/sources/pyside-tools/android_deploy.py
+++ b/sources/pyside-tools/android_deploy.py
@@ -8,11 +8,11 @@ import traceback
 from pathlib import Path
 from textwrap import dedent
 
-from deploy_lib import (setup_python, get_config, cleanup, install_python_dependencies,
-                        config_option_exists, find_pyside_modules, MAJOR_VERSION)
-from deploy_lib.android import (extract_and_copy_jar, get_wheel_android_arch,
-                                Buildozer, AndroidData)
-
+from deploy_lib import (MAJOR_VERSION, cleanup, config_option_exists,
+                        find_pyside_modules, get_config,
+                        install_python_dependencies, setup_python)
+from deploy_lib.android import (AndroidData, Buildozer, extract_and_copy_jar,
+                                get_wheel_android_arch)
 
 """ pyside6-android-deploy deployment tool
 
@@ -166,9 +166,10 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non
         if not dry_run:
             buildozer_build_dir = config.project_dir / ".buildozer"
             if not buildozer_build_dir.exists():
-                logging.info(f"[DEPLOY] Unable to copy {buildozer_build_dir} to {generated_files_path}"
-                             f"{buildozer_build_dir} does not exist")
-            logging.info(f"[DEPLOY] copy {buildozer_build_dir} to {generated_files_path}")
+                logging.info(f"[DEPLOY] Unable to copy {buildozer_build_dir} to "
+                             f"{generated_files_path}. {buildozer_build_dir} does not exist")
+            logging.info(f"[DEPLOY] Copying {str(buildozer_build_dir)} to "
+                         f"{str(generated_files_path)}")
             shutil.move(buildozer_build_dir, generated_files_path)
 
         logging.info(f"[DEPLOY] apk created in {config.exe_dir}")
diff --git a/sources/pyside-tools/deploy.py b/sources/pyside-tools/deploy.py
index 342e5ef40..b19fbb0d1 100644
--- a/sources/pyside-tools/deploy.py
+++ b/sources/pyside-tools/deploy.py
@@ -34,8 +34,9 @@ import traceback
 from pathlib import Path
 from textwrap import dedent
 
-from deploy_lib import (setup_python, get_config, cleanup, install_python_dependencies, finalize,
-                        config_option_exists, Config, MAJOR_VERSION)
+from deploy_lib import (MAJOR_VERSION, Config, cleanup, config_option_exists,
+                        finalize, get_config, install_python_dependencies,
+                        setup_python)
 
 
 def main(main_file: Path = None, name: str = None, config_file: Path = None, init: bool = False,
diff --git a/sources/pyside-tools/deploy_lib/__init__.py b/sources/pyside-tools/deploy_lib/__init__.py
index 003bac5f4..468a03673 100644
--- a/sources/pyside-tools/deploy_lib/__init__.py
+++ b/sources/pyside-tools/deploy_lib/__init__.py
@@ -6,8 +6,8 @@ MAJOR_VERSION = 6
 EXE_FORMAT = ".exe" if sys.platform == "win32" else ".bin"
 
 from .commands import run_command
-from .nuitka_helper import Nuitka
 from .config import BaseConfig, Config
+from .nuitka_helper import Nuitka
+from .deploy_util import (cleanup, config_option_exists, finalize, get_config,
+                          install_python_dependencies, setup_python)
 from .python_helper import PythonExecutable, find_pyside_modules
-from .deploy_util import (cleanup, finalize, get_config, setup_python, install_python_dependencies,
-                          config_option_exists)
diff --git a/sources/pyside-tools/deploy_lib/android/__init__.py b/sources/pyside-tools/deploy_lib/android/__init__.py
index e53f41848..907e12e1f 100644
--- a/sources/pyside-tools/deploy_lib/android/__init__.py
+++ b/sources/pyside-tools/deploy_lib/android/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-from .android_helper import (create_recipe, extract_and_copy_jar, get_wheel_android_arch,
-                             AndroidData, get_llvm_readobj, find_lib_dependencies,
-                             find_qtlibs_in_wheel)
+from .android_helper import (AndroidData, create_recipe, extract_and_copy_jar,
+                             find_lib_dependencies, find_qtlibs_in_wheel,
+                             get_llvm_readobj, get_wheel_android_arch)
 from .buildozer import Buildozer
diff --git a/sources/pyside-tools/deploy_lib/android/android_helper.py b/sources/pyside-tools/deploy_lib/android/android_helper.py
index 4489909d5..2299eab25 100644
--- a/sources/pyside-tools/deploy_lib/android/android_helper.py
+++ b/sources/pyside-tools/deploy_lib/android/android_helper.py
@@ -3,11 +3,11 @@
 
 import logging
 import zipfile
-from zipfile import ZipFile
 from dataclasses import dataclass
-from typing import Set, List
-
 from pathlib import Path
+from typing import List, Set
+from zipfile import ZipFile
+
 from jinja2 import Environment, FileSystemLoader
 
 from .. import run_command
diff --git a/sources/pyside-tools/deploy_lib/android/recipes/PySide6/__init__.tmpl.py b/sources/pyside-tools/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
index d79f03676..37669cff1 100644
--- a/sources/pyside-tools/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
+++ b/sources/pyside-tools/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
@@ -1,12 +1,13 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-from pythonforandroid.recipe import PythonRecipe
-from pythonforandroid.logger import info
-import zipfile
 import shutil
+import zipfile
 from pathlib import Path
 
+from pythonforandroid.logger import info
+from pythonforandroid.recipe import PythonRecipe
+
 
 class PySideRecipe(PythonRecipe):
     version = '{{ version }}'
diff --git a/sources/pyside-tools/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py b/sources/pyside-tools/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
index c1cc14967..d6ab037bf 100644
--- a/sources/pyside-tools/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
+++ b/sources/pyside-tools/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
@@ -1,12 +1,13 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-from pythonforandroid.recipe import PythonRecipe
-from pythonforandroid.logger import info
-import zipfile
 import shutil
+import zipfile
 from pathlib import Path
 
+from pythonforandroid.logger import info
+from pythonforandroid.recipe import PythonRecipe
+
 
 class ShibokenRecipe(PythonRecipe):
     version = '{{ version }}'
diff --git a/sources/pyside-tools/deploy_lib/commands.py b/sources/pyside-tools/deploy_lib/commands.py
index 44785533a..3a7e2a2e2 100644
--- a/sources/pyside-tools/deploy_lib/commands.py
+++ b/sources/pyside-tools/deploy_lib/commands.py
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+import json
 import subprocess
 import sys
-import logging
-from typing import List
-
-import json
 from pathlib import Path
+from typing import List
 
 """
 All utility functions for deployment
diff --git a/sources/pyside-tools/deploy_lib/config.py b/sources/pyside-tools/deploy_lib/config.py
index 6859b1f76..f6898ad72 100644
--- a/sources/pyside-tools/deploy_lib/config.py
+++ b/sources/pyside-tools/deploy_lib/config.py
@@ -4,10 +4,11 @@
 import configparser
 import logging
 import warnings
-from pathlib import Path
 from configparser import ConfigParser
+from pathlib import Path
 
 from project import ProjectData
+
 from .commands import run_qmlimportscanner
 
 # Some QML plugins like QtCore are excluded from this list as they don't contribute much to
diff --git a/sources/pyside-tools/deploy_lib/deploy_util.py b/sources/pyside-tools/deploy_lib/deploy_util.py
index 02a7ed39e..a73ccb0eb 100644
--- a/sources/pyside-tools/deploy_lib/deploy_util.py
+++ b/sources/pyside-tools/deploy_lib/deploy_util.py
@@ -1,14 +1,14 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-import sys
 import logging
 import shutil
-
+import sys
 from pathlib import Path
+
+from . import EXE_FORMAT
 from .config import Config
 from .python_helper import PythonExecutable
-from . import EXE_FORMAT
 
 
 def config_option_exists():
diff --git a/sources/pyside-tools/deploy_lib/nuitka_helper.py b/sources/pyside-tools/deploy_lib/nuitka_helper.py
index 52670b2f9..69521bfbb 100644
--- a/sources/pyside-tools/deploy_lib/nuitka_helper.py
+++ b/sources/pyside-tools/deploy_lib/nuitka_helper.py
@@ -1,13 +1,13 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+import logging
 import os
 import sys
-import logging
 from pathlib import Path
 from typing import List
 
-from . import run_command, MAJOR_VERSION
+from . import MAJOR_VERSION, run_command
 
 
 class Nuitka:
diff --git a/sources/pyside-tools/deploy_lib/python_helper.py b/sources/pyside-tools/deploy_lib/python_helper.py
index 7a91ddfa1..22c5017d2 100644
--- a/sources/pyside-tools/deploy_lib/python_helper.py
+++ b/sources/pyside-tools/deploy_lib/python_helper.py
@@ -2,20 +2,22 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 import ast
+import logging
 import os
 import re
 import sys
-import logging
 import warnings
 from typing import List
 from importlib import util
+
 if sys.version_info >= (3, 8):
     from importlib.metadata import version
 else:
     from importlib_metadata import version
+
 from pathlib import Path
 
-from . import Nuitka, run_command, Config
+from . import Config, Nuitka, run_command
 
 IMPORT_WARNING_PYSIDE = (f"[DEPLOY] Found 'import PySide6' in file {0}"
                          ". Use 'from PySide6 import <module>' or pass the module"