Merge pull request #1623 from matthewfeickert/fix/sanitize-rc-version…

…-names [pip] Sanitize release candidate versions to PEP 440
xrootd · Feb 21, 2022 · 3b34050 · 3b34050
2 parents 2741fe4 + c6d9100
commit 3b34050
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
@@ -66,6 +66,12 @@ if version.startswith("v"):
     version = version[1:]
 
 version_parts = version.split(".")
+
+# Ensure release candidates sanitized to <major>.<minor>.<patch>rc<candidate>
+if version_parts[-1].startswith("rc"):
+    version = ".".join(version_parts[:-1]) + version_parts[-1]
+    version_parts = version.split(".")
+
 if len(version_parts[0]) == 8:
     # CalVer
     date = version_parts[0]

diff --git a/packaging/wheel/setup.py b/packaging/wheel/setup.py
@@ -27,6 +27,11 @@ def get_version():
 
     version_parts = version.split(".")
 
+    # Ensure release candidates sanitized to <major>.<minor>.<patch>rc<candidate>
+    if version_parts[-1].startswith("rc"):
+        version = ".".join(version_parts[:-1]) + version_parts[-1]
+        version_parts = version.split(".")
+
     # Assume SemVer as default case
     if len(version_parts[0]) == 8:
         # CalVer