Continued:

[fba.git] / fba / helpers / version.py

diff --git a/fba/helpers/version.py b/fba/helpers/version.py
index 1396b4e27cb444948cffc9a6ccac0cdcda62b543..b6f7c6468463a1103ef120e6cda291ddf9ebd03f 100644 (file)
--- a/fba/helpers/version.py
+++ b/fba/helpers/version.py
@@ -16,6 +16,8 @@
 import logging
 import re
 
+from fba.helpers import software as software_helper
+
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
@@ -26,13 +28,14 @@ patterns = [
     # non-sematic, e.g. 1.2.3.4
     re.compile(r"^(?P<version>v|V{0,1})(\.{0,1})(?P<major>0|[1-9]\d*)\.(?P<minor>0+|[1-9]\d*)(\.(?P<patch>0+|[1-9]\d*)(\.(?P<subpatch>0|[1-9]\d*))?)$"),
     # non-sematic, e.g. 2023-05[-dev]
-    re.compile(r"^(?P<year>[1-9]{1}[0-9]{3})\.(?P<month>[0-9]{2})(-dev){0,1}$"),
+    re.compile(r"^(?P<year>[1-9]{1}[0-9]{3})\.(?P<month>[0-9]{2})(-[a-z]+){0,1}$"),
     # non-semantic, e.g. abcdef0
     re.compile("^[a-f0-9]{7}$"),
 ]
 
 def remove(software: str) -> str:
     logger.debug("software='%s' - CALLED!", software)
+
     if "." not in software and " " not in software:
         logger.warning("software='%s' does not contain a version number.", software)
         return software
@@ -80,7 +83,7 @@ def remove(software: str) -> str:
     software = temp[0:end].strip()
     if " version" in software:
         logger.debug("software='%s' contains word ' version'", software)
-        software = strip_until(software, " version")
+        software = software_helper.strip_until(software, " version")
 
     logger.debug("software='%s' - EXIT!", software)
     return software