| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
- For input_file and project_dir, use relative paths instead of
absolute paths so that it can be checked in to version control.
- Fix tests accordingly.
Fixes: PYSIDE-3146
Pick-to: 6.9 6.8
Change-Id: I4260a4844edc71964d5c2ab907915e5fbbcf4e41
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
| |
Task-number: PYSIDE-3146
Change-Id: I2c23e8ae3302bafc31a1a65013e2f3ed342d22ed
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
| |
Pick-to: 6.8 6.9
Task-number: PYSIDE-1612
Change-Id: I63250605149c1b966017dc9bcb896925c59008a7
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- For qrc files, the warning was wrong because qrc_<filename>.py was
checked instead of rc_<filename>.py. This is now fixed.
- Additionally the warning message now explicitly displays which
python resource file is missing.
- Also added a comment to default.spec to explicitly indicate that
the QML files won't be listed for Design Studio projects.
Pick-to: 6.8 6.9
Task-number: PYSIDE-1612
Change-Id: I59a22bb720a32ae2b9f6e3f856e77d3eb7b1f21d
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
- The error in the specific warning message leads to confusion. This
should now be fixed by rephrasing the message to be more clear.
Pick-to: 6.9
Task-number: PYSIDE-1612
Change-Id: I2cb3b6b33bd05efe60a54e722a6b626fae7bd1e7
Reviewed-by: Ece Cinucen <[email protected]>
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
- There were some updates with respect to PySide6 support
- See changelog here: https://nuitka.net/changelog/Changelog.html#nuitka-release-2-6
Pick-to: 6.8 6.9
Task-number: PYSIDE-1612
Change-Id: If091184a2661f81d3d57342ba48edc35e748fc70
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch refactors the code of the pyside6-project tool to simplify
the upcoming change of the project file format, pyproject.toml.
The CLI tool documentation is also improved.
Task-number: PYSIDE-2714
Change-Id: I010bbb58f3ed8be5ad5f38687f36b4641a4a021d
Reviewed-by: Shyamnath Premnadh <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
| |
This patch cleans up the pyside6-deploy tool code.
Adds some type hints and fixes some casing consistency issues.
Change-Id: I16988ebf8a15bd3d2bfd12366ebacb3ffe4001e2
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a refactor in order to improve the code clarity. In the testing
of the pyside6-project command, importlib.import_module is used to
import the project_lib folder. Currently,
importlib.import_module("project") is ambiguous because it may refer
to both the file and the folder. It chooses the folder over the file.
Task-number: PYSIDE-1612
Pick-to: 6.8
Change-Id: I8903ea9d2112cf2eb7a68d0e302d3c74edcf2c22
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Design Studio projects will specify the resources employed by the
project in the .qrc file. This way, the deployment process is way
simpler since all the file dependencies are stored compiled in a .py
file.
Task-number: PYSIDE-1612
Change-Id: Icc0047e9f9c183a4db51052a84743e5b095ec76a
Pick-to: 6.8
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
Just adding some type hints and a bit of code cleanup
None of the existing logic should be affected by this change.
Task-number: PYSIDE-1612
Pick-to: 6.8
Change-Id: I42175426a03dc463b8da82aa560c3f13ab842392
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- In order to prevent code duplication, a symlink to
tools/cross_compile_android/android_utilities.py is created under
sources/pyside-tools/deploy_lib/android.
When running the script sources/pyside-tools/android_deploy.py,
this works without any issues.
When packaging the tools, the symlink is resolved into the actual file
and the actual file is packaged into the wheels.
- Remove global variable to __init__.py and remove the ones that are
not used
- Add tqdm to requirements.txt
- Adapt tests
- Additionally, include several new test cases to cover error scenarios
more comprehensively
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: I74728be30a2b8214b9a379b0b906fdacbb105833
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
- Handle removal of files/directories in the case of failure
- Add more details to the docstring
Pick-to: 6.8
Fixes: PYSIDE-2965
Change-Id: I6410963385c15899f49b60cae60b2200e8d13012
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Added tests for extra modules and directories to ignore. These are
cli options.
- Fixed an issue where updating a Python set was not functioning
correctly.
Task-number: PYSIDE-2945
Pick-to: 6.8
Change-Id: Ia6b0e9ef98e2e0999bc4782168b3889598cca682
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
- Amends 05b3c28099c1eaff74bba8b06004cc8205b24f45
- Also, ignores 'scenegraph' and 'networkaccess'
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: Ibc1a0ea1525f7d56ed884bc652612d8985479258
Reviewed-by: Jaime Resano <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
| |
One cannot use list in the arguments of a function using lru_cache
Fixes: PYSIDE-2945
Pick-to: 6.8
Change-Id: I2305dab868a634bfb8a3f240d403c07281f7edb8
Reviewed-by: Shyamnath Premnadh <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Nuitka 2.5.1 imposes strict checking for the Qt plugins included
through the --include-qt-plugins option by checking if the plugin
actually exists in PySide6 installation. Consequently, the plugins
"accessiblebridge", and "platforms/darwin" which are not required
by Nuitka are removed from the list of plugins to be included.
- Adapt tests.
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: I89cef4acf102e01c229b1dd6063fc08903ea686d
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Ignoring .webp files are not needed in the newer Nuitka version.
- Additionally, also adds a comment differentiating between the
`plugins` fields used in the deployment configuration file.
- Adapt tests.
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: Ibbaab03021fa50e4777caa346a2c128fd5e1a06c
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When ast library parses a "from . import x" statement, it will return a
module name of None. Therefore, using .startswith() on None will raise
an exception.
Task-number: PYSIDE-1612
Pick-to: 6.8
Change-Id: I6532f4ebc469695ee977840c3cb40f641fb3cdb6
Reviewed-by: Jaime Resano <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
The .git, __pycache__ and .vscode folders should not be included in the
deployed executable. Windows, it causes permission errors when the
cleanup is performed
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: Icfcbe6aa0d3cb2b869a0bb9a68dbe8d1e1d9a5ec
Reviewed-by: Shyamnath Premnadh <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use --include-data-dir to include the QML modules. This would
reduce the command length significantly.
- Additionally, package all the subdirectories of the application
directory. The user may have other relevant resources required
by the application eg: images, fonts, etc.
- Add two new directories for directories to be ignored - docs and
examples. These directories are not required for the application
to run.
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: I6269f77c0fd94a54e3b7a44f317bc144bd68e5ec
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- new class 'DesignStudio' to handle Design Studio projects.
- Currently uses a way of monkey patching to override the 'main.py'
to use 'main_patch.py' which has the same content but with
'app_dir' set to the parent of `main.py``. The reason for doing this
is that Nuitka requires the `main.py` to be in the same directory
as other resources required for the project.
Once the corresponding patch, to alternate between evaluating
'app_dir' based on whether the application is deployed or called
through the Python interpreter, is merged then this temporary fix
of creating 'main_patch.py' can be removed.
- Add tests.
Pick-to: 6.7
Change-Id: I79e6572bdbbf4576fbdd9039a4922997a22139f8
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- There was an issue where if you run pyside6-deploy from a folder
different from the project directory, it creates a new
'pysidedeploy.spec' every time unless you run
'pyside6-deploy -c <config_file>'. This patches fixes this issue by
always creating the pysidedeploy.spec in the main project directory
i.e. the parent directory of the main Python file.
- Additionally, the function 'create_config_file()' can be simplified
since it can never accept an empty 'main_file' argument and the
parameter 'config_file' can be removed.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I435f79e7222a55831cddcfbc50e07bc214e24cee
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- The value provided through cli is prioritized over the value in the
config file.
- Update the docstring for the set_or_fetch function.
- Additionally, fix an error on run_qmlimportscanner() where the first
argument was passed as a list instead of a tuple.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I6afb25c8e88f7ee2fb4a88539d2b8b3170dcdd00
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Configparser does not preserve the formatting of the original file.
As a result when writing into the config file, the formatting is lost.
In the case of pysidedeploy.spec, the blank lines are lost making
the entire config file rather hard to read.
- This patch adds a blank line before the comment lines thus retaining
the original formatting of the file.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: Icd1ebe52d364f4dc9197220161ed6daa6ed577a0
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- ac55d94395849a5a4af2883d2dab82982252c92d helps to fix a TODO where
we can exclude directories from the qmlimportscanner check directly
without moving all the QML files into a temporary directory
- Amend b32183d2cd5fbbd1ac6a53827edf5d40428855ff
Task-number: PYSIDE-1612
Task-number: PYSIDE-2803
Change-Id: I2524af7154b32730d2d823fda6973b9a2c8a76a3
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Implements a comment suggestion from 11064d4dcd688db1d54d7273ad700761fabe3f50
- _find_and_set_** methods renamed to _find_** methods. They now
return the required property.
- Property setters now update the value in the config class as well.
This also aligns with the design of certain other properties.
- Adjust tests.
Task-number: PYSIDE-1612
Pick-to: 6.7
Change-Id: I135d0a64928381a863cbf7235240efc45421324a
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
| |
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I001f0f446d41330e1ef0a798c82297a0e7c47021
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
| |
- Required for @lru_cache decorator
Task-number: PYSIDE-1612
Pick-to: 6.7
Change-Id: I5e62ad93f20f7000e2e0ef37617aa756b3272314
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|
|
|
|
|
|
|
|
|
| |
- Additionally, adapt wheel_tester.py
Pick-to: 6.7
Fixes: PYSIDE-2806
Change-Id: If2c0d8f186142797f3280136298ed299643824f5
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- When the Nuitka command line becomes more than 8191 characters in
Windows, the subprocess call fails with the error message "The
command line is too long". This patch fixes the issue.
- The patch involves moving the contents of the main Python file
to an intermediate file called 'deploy_main.py' and modifying
the deploy_main.py file to start with
'# nuitka_project: <nuitka_option>'. This way, Nuitka picks up the
option directly from deploy_main.py rather than the command line.
- Add relevant tests to consider the scenario.
Pick-to: 6.7
Task-number: PYSIDE-1612
Fixes: PYSIDE-2803
Change-Id: Iacdaa66283cb41dee6df99c9015b4679e299b02e
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Previously, pyside6-qmlimportscanner was run on each of the QML files
by listing the QML files. For projects with a large number of QML
files, this leads to a long command line that exceeds the maximum
command line length on Windows.
- This change modifies the command to use `-rootPath` command line
option to specify the root path of the project directory. This will
recursively find all the QML files in the project directory and its
subdirectories, and find the QML modules used.
- This solution moves all the '.qml' files in the project directory
into a temporary directory and running pyside6-qmlimportscanner on
this temporary directory.
- Additionally, memoize the function run_qmlimportscanner() to avoid
running the qmlimportscanner multiple times for the same project.
Pick-to: 6.7
Task-number: PYSIDE-1612
Task-number: PYSIDE-2803
Change-Id: Ie82fc4e5071debe505fae7b5815b76c89d99ff4c
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
- For certain debian systems, the system Python uses 'dist-packages'
directory for installing Python packages instead of 'site-packages'.
This patchs adds a check for 'dist-packages' directory.
Pick-to: 6.7
Fixes: PYSIDE-2785
Change-Id: I697e2939ff4114cad0e696d8920322d080be9386
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
| |
Pick-to: 6.7 6.5 6.2
Fixes: PYSIDE-2814
Change-Id: I88aa5ecf6a22808fe5efd2c52fd6675b153da936
Reviewed-by: Christian Tismer <[email protected]>
Reviewed-by: Shyamnath Premnadh <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Among the directories ".qtcreator", "site-packages", "deployment" etc
were excluded when finding the QML files and the Python files in the
project.
- Simplify find_and_set_qml_files(self) function by removing the
unnecessary code.
- Memoize pyside_module_imports().
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I55ccb67300c27de73843ad9996da655ba04403fb
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fixes sporadic crashes with Python 3.12
- Supports Numpy 2.0. This is not relevant for us currently, but
it's good to have the latest version.
Pick-to: 6.7
Fixes: PYSIDE-2781
Task-number: PYSIDE-1612
Change-Id: I96a437795018792906ba6cf44e6466dacc154dbf
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
|
| |
Fix a number of miscellaneous flake8 and typing issues exposed after
updating to the modern typing syntax from 3.10 onwards.
Task-number: PYSIDE-2786
Change-Id: I5476d1208dd1da3fa93bdec02bc6124a80b247fc
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We can already use the modern typing syntax introduced with Python 3.10
in 3.9 via future statement definitions, even before we raise the
minimum Python version to 3.10.
Note that direct expressions with "|" don't work yet.
Task-number: PYSIDE-2786
Change-Id: Ie36c140fc960328322502ea29cf6868805a7c558
Reviewed-by: Christian Tismer <[email protected]>
|
|
|
|
|
|
|
|
| |
Add a future statement to all Python source files.
Task-number: PYSIDE-2786
Change-Id: Icd6688c7795a9e16fdcaa829686d57792df27690
Reviewed-by: Adrian Herrmann <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
- Additionally, remove some comments from default.spec that are not
relevant anymore.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: Iea2fed95507b6e649285e409cf8678287bf15a56
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the scenario where 'pyside6-deploy --init' is used on the first run
and for the consequent invocations, only running just 'pyside6-deploy'
without any additional options, the deployment should have worked.
This currently had a bug where it overrides the main Python entrypoint
file with the default option of 'main.py'. This issue is caused due to
the order of 'if' loop in the changed function.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I605c4b9ff2035e85c0b5f73049a3ecc84d0fd80c
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
- enable the tool for macOS
- add dependency .xml to the Android wheels
Pick-to: 6.7
Task-number: PYSIDE-2766
Change-Id: I77495466b8a9cc3565c640beac202d533ee1d2a6
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
- Full support for Python 3.12
- Experiemental support for Python 3.13
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: Ib4699351ec4105de756b4ac16cd7b3a49054a614
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- enables the standalone mode of Nuitka for pyside6-deploy
- the mode can be set either through the command line or the config file
- adapt tests
- update documentation
Pick-to: 6.7
Fixes: PYSIDE-2622
Task-number: PYSIDE-1612
Change-Id: I5a10c857d3e79174d2643139eb2e4f7b5e10d955
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Temporary requirement since my latest changes are not yet merged into
the master branch of p4a. This will be remove once the changes are
in the master branch of p4a.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I0e992b053de727660f4090779ee395e7a85451e6
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Adrian Herrmann <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- These files have to be ignored in the deployment process because
Nuitka is not able to recognize these file formats and considers
them to the dlls instead of data files.
- The missing .webp files breaks the usage of BusyIndicator type of
QtQuick Controls. Hence, a bug report for that is raised in Nuitka
: https://github.com/Nuitka/Nuitka/issues/2854
- Adapt tests
Pick-to: 6.7 6.5
Change-Id: Ic4b3b6c65e059ec618a26361caa62b9d7c608690
Reviewed-by: Adrian Herrmann <[email protected]>
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Check if package e.g. PySide6_AddOns is installed before checking for
the .json file
- If a package is missing, add log warning for the missing package.
If the .json file is missing inspite of the package being installed,
then raise a proper warning.
Pick-to: 6.7 6.7.0
Task-number: PYSIDE-1612
Change-Id: Ia65b06df15df7b334438f439762b135d9f61981d
Reviewed-by: Friedemann Kleint <[email protected]>
|
|
|
|
|
|
|
|
|
| |
- updated to r26b in accordance with Qt 6.7
Task-number: PYSIDE-1612
Change-Id: I7efa6d827b84d92a5571c4e2d337b6545810406a
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Adrian Herrmann <[email protected]>
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-1612
Change-Id: Ieab3a7c7fd43e50e83c30d97cb70f6f1135b69e3
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Adrian Herrmann <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Look at the ast of the python files of the application to identify
the permissions used by the application. Once the permissions
are identified, pass the necessary NS property list key to be added
to the Info.plist file to Nuitka.
- For macOS, when deploying create a macOS application bundle (.app)
by default. This makes it align more with Apple recommendations
and Qt deployment.
- Fix tests.
- Fix wheel_tester.py to consider .app for macOS.
Task-number: PYSIDE-1612
Task-number: PYSIDE-2468
Change-Id: Ie225c9a92c845b432a8e7eaa791a8aeb86ecd988
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
|