diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-01-30 12:09:04 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-01 14:36:12 +0100 |
| commit | 9948f7fd34b268cffaf8cb06d6925f59ce0c538f (patch) | |
| tree | 531f8ceb14ade275523d61816a63dab6fbd357eb /sources/pyside-tools/deploy_lib/__init__.py | |
| parent | 019a1932c559f0d73d2d8bcd4b3b26ba03dbccb8 (diff) | |
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>
Diffstat (limited to 'sources/pyside-tools/deploy_lib/__init__.py')
| -rw-r--r-- | sources/pyside-tools/deploy_lib/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sources/pyside-tools/deploy_lib/__init__.py b/sources/pyside-tools/deploy_lib/__init__.py index 40a7535db..27d178eee 100644 --- a/sources/pyside-tools/deploy_lib/__init__.py +++ b/sources/pyside-tools/deploy_lib/__init__.py @@ -16,6 +16,9 @@ else: EXE_FORMAT = ".bin" DEFAULT_APP_ICON = str((Path(__file__).parent / f"pyside_icon{IMAGE_FORMAT}").resolve()) +IMPORT_WARNING_PYSIDE = (f"[DEPLOY] Found 'import PySide6' in file {0}" + ". Use 'from PySide6 import <module>' or pass the module" + " needed using --extra-modules command line argument") def get_all_pyside_modules(): @@ -30,7 +33,7 @@ def get_all_pyside_modules(): from .commands import run_command, run_qmlimportscanner from .nuitka_helper import Nuitka -from .python_helper import PythonExecutable, find_pyside_modules from .config import BaseConfig, Config -from .deploy_util import (cleanup, finalize, create_config_file, setup_python, - install_python_dependencies, config_option_exists) +from .python_helper import PythonExecutable +from .deploy_util import (cleanup, finalize, create_config_file, + config_option_exists, find_pyside_modules) |