diff options
| author | Christian Tismer <tismer@stackless.com> | 2023-10-14 11:37:51 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2023-10-18 12:56:57 +0200 |
| commit | d6d3729c0f0ebbfcb6b38ba343ff5dc6a3d19bc7 (patch) | |
| tree | e3b069602fb5e65b936561078e2da99bce4fc693 /sources/pyside-tools | |
| parent | 0f8c63342fd03805c5b1d20e3536cceb2a28163b (diff) | |
deploy: Apply fixes when using pyenv and provide readable errors
When the patch for pyenv was applied, some tests in
test_pyside6_deploy.py were broken, which shows up
locally but not (yet) in CI.
For better understanding, the test classes were further
broken up into three groups (irrelevant, might be undone).
Things became clearer by writing a special version of
unittest.TestCase that handles long strings as lists.
REMARK: We are at Python 3.8 and can use ":=" now :=)
Task-number: PYSIDE-1612
Change-Id: I3a479f48b96dd5f95864b8a94af6d01b42ffc196
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/pyside-tools')
| -rw-r--r-- | sources/pyside-tools/deploy.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sources/pyside-tools/deploy.py b/sources/pyside-tools/deploy.py index 0c75350d3..342e5ef40 100644 --- a/sources/pyside-tools/deploy.py +++ b/sources/pyside-tools/deploy.py @@ -74,8 +74,9 @@ def main(main_file: Path = None, name: str = None, config_file: Path = None, ini packages="packages") # required by Nuitka for pyenv Python - if python.is_pyenv_python(): - config.extra_args += " --static-libpython=no" + add_arg = " --static-libpython=no" + if python.is_pyenv_python() and add_arg not in config.extra_args: + config.extra_args += add_arg # writing config file # in the case of --dry-run, we use default.spec as reference. Do not save the changes |