Parse version from MUSCLE v5

rrwick · Nov 19, 2021 · 87953f2 · 87953f2
1 parent b9306e6
commit 87953f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/test/test_software.py b/test/test_software.py
@@ -23,6 +23,11 @@ def test_parse_muscle_version_1():
 
 
 def test_parse_muscle_version_2():
+    output = 'muscle 5.0.1430_osx64'
+    assert trycycler.software.parse_muscle_version(output) == '5.0.1430'
+
+
+def test_parse_muscle_version_3():
     output = 'Not the correct output'
     assert trycycler.software.parse_muscle_version(output) == '?'
 

diff --git a/trycycler/software.py b/trycycler/software.py
@@ -59,10 +59,14 @@ def check_muscle():
 
 
 def parse_muscle_version(output):
-    if 'MUSCLE v' in output:
+    if 'MUSCLE v' in output:  # for version 3
         output = output.split('MUSCLE v')[1]
         output = output.split(' ')[0]
         return output.strip()
+    elif 'muscle ' in output:  # For version 5
+        output = output.split('muscle ')[1]
+        output = output.split('_')[0]
+        return output.strip()
     else:
         return '?'