Make commercial version string PEP 440 compliant

PEP 440 requires that local version segments be delimited with a + sign.

Pick-to: 6.2 6.4
Fixes: PYSIDE-2229
Change-Id: I87f243b6cc5e036a23f2ec7235e9f35347a789eb
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Simo Fält <[email protected]>

Author: adrianghc

build_scripts/wheel_utils.py

@@ -51,11 +51,10 @@ def get_package_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:
+    if release_version_type and not release_version_type.startswith("comm") and pre_release_version:
         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 and 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.