fix: Handle non-standard software versions with alpha characters in t…

…he last part of the version. (tektronix#81)

Signed-off-by: qthompso <[email protected]>

CHANGELOG.md

@@ -21,6 +21,7 @@ Things to be included in the next release go here.
 ### Fixed
 
 - Updated the auto-generated commands for a handful of models to fix various issues
+- Updated the function responsible for converting version strings into `Version` objects to be able to handle software versions with non-standard formats.
 
 ______________________________________________________________________
 

src/tm_devices/helpers/functions.py

@@ -403,6 +403,7 @@ def get_version(version_string: str) -> Version:
         The Version object.
     """
     version_parts = version_string.split(".")
+    found_alpha = False
     try:
         version = Version(version_string)
     except InvalidVersion:
@@ -413,7 +414,14 @@ def get_version(version_string: str) -> Version:
                 version_string.replace("." + version_parts[-1], "+" + version_parts[-1])
             )
         else:
-            raise
+            output_str = ""
+            for char in version_parts[-1]:
+                if char.isalpha() and not found_alpha:
+                    output_str += "+" + char
+                    found_alpha = True
+                else:
+                    output_str += char
+            version = Version(version_string.replace(version_parts[-1], output_str))
     return version
 
 

tests/test_helpers.py

@@ -408,7 +408,9 @@ def test_detect_visa_resource_expression(
         ("1.2.3", Version("1.2.3")),
         ("1.265.301", Version("1.265.301")),
         ("1.2.3.abc", Version("1.2.3+abc")),
+        ("1.2.3.4abc", Version("1.2.3.4+abc")),
         ("1.20.345.abc", Version("1.20.345+abc")),
+        ("1.20.345.4abc123", Version("1.20.345.4+abc123")),
     ],
 )
 def test_get_version(version_string: str, expected_result: Version) -> None: