diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-01-28 09:22:37 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-28 10:22:28 +0000 |
| commit | 48864b4ff74fed53457b3269ce2d3a9d4e6d40a9 (patch) | |
| tree | 31401097d5e9f585e62723bae0331dd6411c86e1 | |
| parent | ce992472ebc4fd9335e83730d4662e6315959d54 (diff) | |
Allow empty PRE_RELEASE_VERSION for release wheels
Change-Id: If53fb034ee0c62b25e9a672ff687a0e1f4c592f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 1966aae5401de5129f571fdb5bb1d9b1e69ab143)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/wheel_utils.py | 9 | ||||
| -rw-r--r-- | coin_build_instructions.py | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build_scripts/wheel_utils.py b/build_scripts/wheel_utils.py index bfff47f04..6f42e004d 100644 --- a/build_scripts/wheel_utils.py +++ b/build_scripts/wheel_utils.py @@ -85,13 +85,14 @@ def get_package_version(): patch_version = d['pyside_MICRO_VERSION'] final_version = f"{major_version}.{minor_version}.{patch_version}" - release_version_type = d['pyside_PRE_RELEASE_VERSION_TYPE'] - pre_release_version = d['pyside_PRE_RELEASE_VERSION'] + release_version_type = d.get('pyside_PRE_RELEASE_VERSION_TYPE') + pre_release_version = d.get('pyside_PRE_RELEASE_VERSION') + if pre_release_version and release_version_type: final_version = f"{final_version}{release_version_type}{pre_release_version}" - if release_version_type.startswith("comm"): - final_version = f"{final_version}.{release_version_type}" + if release_version_type.startswith("comm"): + final_version = f"{final_version}.{release_version_type}" # Add the current timestamp to the version number, to suggest it # is a development snapshot build. diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 61d176699..504890708 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -99,9 +99,8 @@ def is_snapshot_build(): pyside_project_dir = os.path.join(setup_script_dir, "sources", "pyside6") d = parse_cmake_conf_assignments_by_key(pyside_project_dir) - - release_version_type = d['pyside_PRE_RELEASE_VERSION_TYPE'] - pre_release_version = d['pyside_PRE_RELEASE_VERSION'] + release_version_type = d.get('pyside_PRE_RELEASE_VERSION_TYPE') + pre_release_version = d.get('pyside_PRE_RELEASE_VERSION') if pre_release_version and release_version_type: return True return False |