diff options
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | sources/pyside-tools/deploy_lib/default.spec | 4 | ||||
| -rw-r--r-- | sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py | 14 |
3 files changed, 9 insertions, 13 deletions
diff --git a/requirements.txt b/requirements.txt index 8a3d9912f..7055f6a5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,11 +6,7 @@ wheel>=0.35 PyOpenGL pyinstaller==3.6; platform_machine != 'aarch64' numpy -nuitka==1.4.8; platform_machine != 'aarch64' distro; sys_platform == 'linux' patchelf==0.15; sys_platform == 'linux' -pkginfo; sys_platform == 'linux' -jinja2; sys_platform == 'linux' -buildozer==1.5.0; sys_platform == 'linux' tqdm; sys_platform == 'linux' gitpython; sys_platform == 'linux' diff --git a/sources/pyside-tools/deploy_lib/default.spec b/sources/pyside-tools/deploy_lib/default.spec index c49ef53bf..473898ed2 100644 --- a/sources/pyside-tools/deploy_lib/default.spec +++ b/sources/pyside-tools/deploy_lib/default.spec @@ -24,7 +24,7 @@ python_path = # python packages to install # ordered-set: increase compile time performance of nuitka packaging # zstandard: provides final executable size optimization -packages = nuitka==1.5.4,ordered_set,zstandard +packages = nuitka==1.8.0,ordered_set,zstandard # buildozer: for deploying Android application android_packages = buildozer==1.5.0,cython==0.29.33 @@ -51,7 +51,7 @@ plugins = platforms_qtforandroid # (str) specify any extra nuitka arguments # eg: extra_args = --show-modules --follow-stdlib -extra_args = --quiet --noinclude-qt-translations=True +extra_args = --quiet --noinclude-qt-translations [buildozer] diff --git a/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py b/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py index ce292d786..1277ccefe 100644 --- a/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py +++ b/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py @@ -99,7 +99,7 @@ class TestPySide6DeployWidgets(DeployTestBase): self.expected_run_cmd = ( f"{sys.executable} -m nuitka {str(self.main_file)} --follow-imports --onefile" f" --enable-plugin=pyside6 --output-dir={str(self.deployment_files)} --quiet" - f" --noinclude-qt-translations=True" + f" --noinclude-qt-translations" ) if sys.platform.startswith("linux"): self.expected_run_cmd += f" --linux-onefile-icon={str(self.linux_onefile_icon)}" @@ -130,9 +130,9 @@ class TestPySide6DeployWidgets(DeployTestBase): self.assertEqual(config_obj.get_value("app", "input_file"), "tetrix.py") self.assertEqual(config_obj.get_value("app", "project_dir"), ".") self.assertEqual(config_obj.get_value("app", "exec_directory"), ".") - self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.5.4,ordered_set,zstandard") + self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.8.0,ordered_set,zstandard") self.assertEqual(config_obj.get_value("qt", "qml_files"), "") - equ_base = "--quiet --noinclude-qt-translations=True" + equ_base = "--quiet --noinclude-qt-translations" equ_value = equ_base + " --static-libpython=no" if is_pyenv_python() else equ_base self.assertEqual(config_obj.get_value("nuitka", "extra_args"), equ_value) self.assertEqual(config_obj.get_value("qt", "excluded_qml_plugins"), "") @@ -157,7 +157,7 @@ class TestPySide6DeployQml(DeployTestBase): self.expected_run_cmd = ( f"{sys.executable} -m nuitka {str(self.main_file)} --follow-imports --onefile" f" --enable-plugin=pyside6 --output-dir={str(self.deployment_files)} --quiet" - f" --noinclude-qt-translations=True --include-qt-plugins=all" + f" --noinclude-qt-translations --include-qt-plugins=all" f" --include-data-files={str(self.temp_example_qml / self.first_qml_file)}=" f"./main.qml --include-data-files=" f"{str(self.temp_example_qml /self.second_qml_file)}=./MovingRectangle.qml" @@ -194,9 +194,9 @@ class TestPySide6DeployQml(DeployTestBase): self.assertEqual(config_obj.get_value("app", "input_file"), "main.py") self.assertEqual(config_obj.get_value("app", "project_dir"), ".") self.assertEqual(config_obj.get_value("app", "exec_directory"), ".") - self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.5.4,ordered_set,zstandard") + self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.8.0,ordered_set,zstandard") self.assertEqual(config_obj.get_value("qt", "qml_files"), "main.qml,MovingRectangle.qml") - equ_base = "--quiet --noinclude-qt-translations=True" + equ_base = "--quiet --noinclude-qt-translations" equ_value = equ_base + " --static-libpython=no" if is_pyenv_python() else equ_base self.assertEqual(config_obj.get_value("nuitka", "extra_args"), equ_value) self.assertEqual( @@ -252,7 +252,7 @@ class TestPySide6DeployWebEngine(DeployTestBase): expected_run_cmd = ( f"{sys.executable} -m nuitka {str(main_file)} --follow-imports --onefile" f" --enable-plugin=pyside6 --output-dir={str(deployment_files)} --quiet" - f" --noinclude-qt-translations=True --include-qt-plugins=all" + f" --noinclude-qt-translations --include-qt-plugins=all" f" {data_files_cmd}" ) |