Merge branch 'development'

cidgoh · Mar 1, 2023 · a283815 · a283815
2 parents caf5ff1 + 87b06c6
commit a283815
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bin/functions.py b/bin/functions.py
@@ -45,7 +45,7 @@ def select_snpeff_records(eff_string, ao_count):
     eff_list = eff_string.split(",")
 
     # if any records in the row contain '|p.', take only those records
-    EFF_records_list = [s for s in eff_list if '|p.' in s]
+    EFF_records_list = [s for s in eff_list if '|p.' or 'LOF' in s]
 
     # if no records contain '|p.', take the "intergenic" record
     if len(EFF_records_list) == 0:

diff --git a/conf/profiles.config b/conf/profiles.config
@@ -7,6 +7,7 @@ profiles {
         podman.enabled         = false
         shifter.enabled        = false
         charliecloud.enabled   = false
+        conda.createTimeout    = '1 h'
         includeConfig 'conda.config'
     }
     mamba {