feat: Added support for a new custom version string format, `"1.2.3-c…

…ustom.1234+abcdefghi"` (#376)
tektronix · Feb 4, 2025 · ddb378c · ddb378c
1 parent 0af4140
commit ddb378c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,10 @@ Valid subsections within a version are:
 
 Things to be included in the next release go here.
 
+### Added
+
+- Updated the `get_version()` function to support more custom version string formats, e.g. `"1.2.3-custom.1234+abcdefghi"`.
+
 ---
 
 ## v3.1.0 (2025-01-22)

diff --git a/src/tm_devices/helpers/functions.py b/src/tm_devices/helpers/functions.py
@@ -542,7 +542,10 @@ def get_version(version_string: str) -> Version:
         elif version_string.count("-") == 1 and _VALID_VERSION_REGEX.match(
             version_string.split("-")[0]
         ):
-            version = Version(version_string.replace("-", "+"))
+            new_version_string = version_string.replace("-", "+", 1)
+            if new_version_string.count("+") == 2:  # noqa: PLR2004
+                new_version_string = "-".join(new_version_string.rsplit("+", 1))
+            version = Version(new_version_string)
         else:
             output_str = ""
             for char in version_parts[-1]:

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -412,6 +412,7 @@ def test_detect_visa_resource_expression(
         ("1.2.3-alpha.4", Version("1.2.3.alpha.4")),
         ("1.2.3-custom.52", Version("1.2.3+custom.52")),
         ("1.2.3-123custom.52", Version("1.2.3+123custom.52")),
+        ("1.2.3-custom.1234+abcdefghi", Version("1.2.3+custom.1234-abcdefghi")),
     ],
 )
 def test_get_version(version_string: str, expected_result: Version) -> None: