diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-22 08:47:44 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-22 11:39:31 +0100 |
commit | 3a2591f69ea3554b6cd26fcb9bb4bd5d10c9f3ab (patch) | |
tree | f296ca74731cd0ca9176f7b13a3f3b3f4124880d /scripts/packagetesting | |
parent | 8fc188b19df4e095537b915235841615e3a67752 (diff) |
testwheel.py: Fix for 5.15
- Compare installed package names case-insenitively
- Move check for option -p (no installer) down, doing the
Qt Designer test also in this case
Pick-to: master
Change-Id: I8dc1d34b2bf98b23fbbb0071c689e1fd12b5c274
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'scripts/packagetesting')
-rw-r--r-- | scripts/packagetesting/testwheel.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/packagetesting/testwheel.py b/scripts/packagetesting/testwheel.py index 05f4905a..801f37d4 100644 --- a/scripts/packagetesting/testwheel.py +++ b/scripts/packagetesting/testwheel.py @@ -142,7 +142,7 @@ def has_module(name): code, lines = run_process([sys.executable, "-m", "pip", "list"]) for l in lines: tokens = l.split(' ') - if len(tokens) >= 1 and tokens[0] == name: + if len(tokens) >= 1 and tokens[0].lower() == name.lower(): return True return False @@ -308,13 +308,13 @@ if __name__ == "__main__": for e in examples(root_ex): run_example(root_ex, e) - if not do_pyinst: - sys.exit(0) - if VERSION >= (6, 1, 0): print("Launching Qt Designer. Please check the custom widgets.") execute([f'pyside{VERSION[0]}-designer']) + if not do_pyinst: + sys.exit(0) + if VERSION >= (6, 4, 0): if not has_module("Nuitka"): print("Nuitka not found, skipping test") |