Fix SPAdes version requirement: 3.14+

petaleaf · Jan 18, 2022 · 6f12fae · 6f12fae
1 parent 54a2943
commit 6f12fae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/test/test_misc.py b/test/test_misc.py
@@ -369,10 +369,16 @@ def test_spades_version_status_8(self):
         self.assertEqual(unicycler.misc.spades_status_from_version('3.13.0'), 'too old')
 
     def test_spades_version_status_9(self):
-        self.assertEqual(unicycler.misc.spades_status_from_version('3.13.1'), 'good')
+        self.assertEqual(unicycler.misc.spades_status_from_version('3.13.1'), 'too old')
 
     def test_spades_version_status_10(self):
-        self.assertEqual(unicycler.misc.spades_status_from_version('3.14.1'), 'good')
+        self.assertEqual(unicycler.misc.spades_status_from_version('3.14.0'), 'good')
 
     def test_spades_version_status_11(self):
+        self.assertEqual(unicycler.misc.spades_status_from_version('3.14.1'), 'good')
+
+    def test_spades_version_status_12(self):
+        self.assertEqual(unicycler.misc.spades_status_from_version('3.15.3'), 'good')
+
+    def test_spades_version_status_13(self):
         self.assertEqual(unicycler.misc.spades_status_from_version('4.0.0'), 'too new')
diff --git a/unicycler/misc.py b/unicycler/misc.py
@@ -849,19 +849,10 @@ def spades_status_from_version(version):
     assert major_version == 3
 
     minor_version = int(version.split('.')[1])
-    if minor_version < 13:
+    if minor_version < 14:
         return 'too old'
-    assert minor_version >= 13
-
-    patch_version = int(version.split('.')[2])
-    if minor_version > 13:
+    else:
         return 'good'
-    assert minor_version == 13
-    if minor_version == 13:
-        if patch_version < 1:
-            return 'too old'
-        else:
-            return 'good'
 
 
 def racon_path_and_version(racon_path):