diff options
| author | Shyamnath Premnadh <shyamnath.premnadh@qt.io> | 2023-03-30 13:20:30 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <shyamnath.premnadh@qt.io> | 2023-03-30 14:09:39 +0200 |
| commit | fde01ab6cd00f31de7b1051ad7a09d401ac2640c (patch) | |
| tree | 995de3eada72fc6fc89135ee8b9d4aba2028aefa | |
| parent | 3813faa6dac1377e390c9b89fff236bbc0bf8bbb (diff) | |
Deployment: Change "desktop_packages" back to "packages"
- breaks source compatibility otherwise
Task-number: PYSIDE-1612
Pick-to: 6.5
Change-Id: Ie0fd353872b7a93c94b650b09aa0fa53692e2455
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
| -rw-r--r-- | sources/pyside-tools/deploy.py | 2 | ||||
| -rw-r--r-- | sources/pyside-tools/deploy_lib/default.spec | 2 | ||||
| -rw-r--r-- | sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sources/pyside-tools/deploy.py b/sources/pyside-tools/deploy.py index 043018eea..904d4a2a4 100644 --- a/sources/pyside-tools/deploy.py +++ b/sources/pyside-tools/deploy.py @@ -77,7 +77,7 @@ def main(main_file: Path = None, name: str = None, config_file: Path = None, ini cleanup(generated_files_path=generated_files_path, config=config) install_python_dependencies(config=config, python=python, init=init, - packages="desktop_packages") + packages="packages") # writing config file if not dry_run: diff --git a/sources/pyside-tools/deploy_lib/default.spec b/sources/pyside-tools/deploy_lib/default.spec index d63fb46b7..335ab95ba 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 -desktop_packages = nuitka==1.4.8,ordered_set,zstandard +packages = nuitka==1.4.8,ordered_set,zstandard [qt] 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 f695dfd83..e822ff01c 100644 --- a/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py +++ b/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py @@ -95,7 +95,7 @@ class TestPySide6Deploy(unittest.TestCase): 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", "desktop_packages"), "nuitka==1.4.8,ordered_set,zstandard") + self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.4.8,ordered_set,zstandard") self.assertEqual(config_obj.get_value("qt", "qml_files"), "") self.assertEqual( config_obj.get_value("nuitka", "extra_args"), "--quiet --noinclude-qt-translations=True" @@ -149,7 +149,7 @@ class TestPySide6Deploy(unittest.TestCase): 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", "desktop_packages"), "nuitka==1.4.8,ordered_set,zstandard") + self.assertEqual(config_obj.get_value("python", "packages"), "nuitka==1.4.8,ordered_set,zstandard") self.assertEqual(config_obj.get_value("qt", "qml_files"), "main.qml,MovingRectangle.qml") self.assertEqual( config_obj.get_value("nuitka", "extra_args"), "--quiet --noinclude-qt-translations=True" |