Deployment: More Refactoring and minor bug fixes

- setup_python() moved to constructor of PythonExecutable.
 -install_python_dependencies() moved under PythonExecutable in
  python_helper.py.
- create_executable() of PythonExecutable removed. Instead, we call
  Nuitka.create_executable() directly. This removes unncessary import
  problems when using PythonExecutable class for Android Deployment.
- nuitka==1.8.0 changed to Nuitka=1.8 in default.spec to match with
  the installed version. Otherwise, it forces the reinstall of
  Nuitka==1.8 every time (bug).
- Remove recomputation of qt_plugins and local_libs. If the values
  exist in pysidedeploy.spec, then they should not be computed again.
  This serves the purposes of speeding up the deployment and also
  to no modifying the already existing pysidedeploy.spec.
- find_pyside_modules() moved from python_helper.py to deploy_util.py.
- Adapt tests.
- Remove os.fspath wrapping from python.exe. This is not needed as
 python.exe is already pathlib.Path.

Pick-to: 6.5 6.6
Task-number: PYSIDE-1612
Change-Id: Ic598e57cd2f2779c410b12fc9584cf60c5e94505
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/sources/pyside-tools/android_deploy.py b/sources/pyside-tools/android_deploy.py
index 83350bc5f..362fb3766 100644
--- a/sources/pyside-tools/android_deploy.py
+++ b/sources/pyside-tools/android_deploy.py
@@ -8,8 +8,8 @@ import traceback
 from pathlib import Path
 from textwrap import dedent
 
-from deploy_lib import (setup_python, create_config_file, cleanup, install_python_dependencies,
-                        config_option_exists, MAJOR_VERSION)
+from deploy_lib import (create_config_file, cleanup, config_option_exists, PythonExecutable,
+                        MAJOR_VERSION)
 from deploy_lib.android import AndroidData, AndroidConfig
 from deploy_lib.android.buildozer import Buildozer
 
@@ -96,7 +96,7 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non
     android_data = AndroidData(wheel_pyside=pyside_wheel, wheel_shiboken=shiboken_wheel,
                                ndk_path=ndk_path, sdk_path=sdk_path)
 
-    python = setup_python(dry_run=dry_run, force=force, init=init)
+    python = PythonExecutable(dry_run=dry_run, init=init, force=force)
 
     config_file_exists = config_file and Path(config_file).exists()
 
@@ -117,8 +117,7 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non
 
     cleanup(config=config, is_android=True)
 
-    install_python_dependencies(config=config, python=python, init=init,
-                                packages="android_packages", is_android=True)
+    python.install_dependencies(config=config, packages="android_packages", is_android=True)
 
     # set application name
     if name: