Closes #267. Contributes to #268

ODiogoSilva · May 29, 2017 · 5151920 · 5151920
1 parent 742c1d7
commit 5151920
Show file tree

Hide file tree

Showing 14 changed files with 1,018 additions and 408 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -11,7 +11,9 @@
 ### Process
 
 - Refactored concatenation procedure increasing performance up to 29x in run
-time [0.5.4]
+time [0.5.4].
+- Added automatic recognition of "?" as missing data symbols, in addition to
+"n" and "x" [0.5.5].
 
 ### Statistics
 

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@ def mcl_data_files():
 
 setup(
     name="trifusion",
-    version=VERSION+"-1",
+    version=VERSION,
     packages=["trifusion",
               "trifusion.base",
               "trifusion.data",

diff --git a/trifusion/TriSeq.py b/trifusion/TriSeq.py
@@ -296,7 +296,7 @@ def main_parser(arg, alignment_list):
                                  pbar=pbar)
 
 
-def get_args(arg_list=None):
+def get_args(arg_list=None, unittest=False):
 
     # The inclusion of the argument definition in main, makes it possible to
     # import this file as a module and not triggering argparse. The
@@ -467,7 +467,7 @@ def get_args(arg_list=None):
     args = parser.parse_args(arg_list)
 
     # Print help when no arguments are provided
-    if len(sys.argv) == 1:
+    if len(sys.argv) == 1 and not unittest:
         parser.print_help()
         sys.exit(1)
 

diff --git a/trifusion/__init__.py b/trifusion/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.5.4"
+__version__ = "0.5.5"
 __build__ = "270517"
 __author__ = "Diogo N. Silva"
 __copyright__ = "Diogo N. Silva"