aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build_scripts/wheel_utils.py9
-rw-r--r--coin_build_instructions.py5
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