Merge pull request #16 from hisplan/master

bwa mem is called twice

Author: lordzappo

.gitignore

@@ -6,3 +6,4 @@ cmo.egg-info/
 **.swp
 docs/build/
 cmo/_version.py
+venv

bin/cmo_bwa_mem

@@ -16,8 +16,7 @@ if __name__ =='__main__':
     parser.add_argument("--fastq2" )
     parser.add_argument("--output", required=True)
     parser.add_argument("--sam", action='store_true', help="Produce Sam instead of the default  bam (Boolean)")
-    parser.add_argument("--version", required=True, choices=cmo.util.programs['bwa'].keys())
-    args_dict = parse_bwa_help(cmo.util.programs['bwa']['default'] + " mem")
+    parser.add_argument("--version", required=True, choices=cmo.util.programs['bwa'].keys())    
     if "-h" in args_dict:
         args_dict['-hh']=args_dict['-h']
         del args_dict['-h']

cmo/data/cmo_resources.json

@@ -11,7 +11,8 @@
         {
             "default":"/opt/common/CentOS_6/bwa/bwa-0.7.12/bwa",
             "0.7.12":"/opt/common/CentOS_6/bwa/bwa-0.7.12/bwa",
-            "0.7.10":"/opt/common/CentOS_6/bwa/bwa-0.7.10/bwa"
+            "0.7.10":"/opt/common/CentOS_6/bwa/bwa-0.7.10/bwa",
+            "0.7.5a":"/opt/common/CentOS_6/bwa/bwa-0.7.5a/bwa"
         },
         "gatk":
         {
@@ -25,9 +26,15 @@
             "default":"/opt/common/CentOS_6-dev/samstat/1.5.1/samstat",
             "1.5.1":"/opt/common/CentOS_6-dev/samstat/1.5.1/samstat"
         },
+        "trimgalore":
+        {
+            "default":"/opt/common/CentOS_6/trim_galore/Trim_Galore_v0.2.5/trim_galore",
+            "0.2.5":"/opt/common/CentOS_6/trim_galore/Trim_Galore_v0.2.5/trim_galore"
+        },
         "cutadapt":
         { 
             "default":"/opt/common/CentOS_6-dev/python/python-2.7.10/bin/cutadapt",
+            "1.1":"/opt/common/CentOS_6/cutadapt/cutadapt-1.1/bin/cutadapt",
             "1.9.1":"/opt/common/CentOS_6-dev/python/python-2.7.10/bin/cutadapt"
         },
         "convertqualityscore":
@@ -55,7 +62,8 @@
         {
             "default":"/opt/common/CentOS_6/picard/picard-tools-1.129/picard.jar",
             "1.124":"/opt/common/CentOS_6/picard/picard-tools-1.124/picard.jar",
-            "1.129":"/opt/common/CentOS_6/picard/picard-tools-1.129/picard.jar"
+            "1.129":"/opt/common/CentOS_6/picard/picard-tools-1.129/picard.jar",
+            "1.96":"/opt/common/CentOS_6/picard/picard-tools-1.96/"
         },
         "java":
         {