Merge branch 'hotfix/0.7.60'

uoregon-postlethwait · Aug 30, 2019 · ea9cf8c · ea9cf8c
2 parents 1954999 + d71c3a4
commit ea9cf8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.59
+0.7.60
diff --git a/prost/_version.py b/prost/_version.py
@@ -1,2 +1,2 @@
 # Autogenerated via git flow.
-__version__ = '0.7.59'
+__version__ = '0.7.60'
diff --git a/prost/prost.py b/prost/prost.py
@@ -4645,7 +4645,18 @@ def tsv_no_hits(self, conf, samples, short_seqs, alignments):
                     row.append(";".join(locs))
 
                 # Soft Clipped?
-                row.append(loc.is_soft_clipped)
+                if count_no_hit_gen_locs > max_locs_allowed:
+                    row.append("MLAE:{}".format(count_no_hit_gen_locs))
+                elif count_no_hit_gen_locs > max_locs_to_report:
+                    row.append("TML:{}".format(count_no_hit_gen_locs))
+                elif count_no_hit_gen_locs == 0:
+                    # no "no_hit" locations...
+                    row.append("")
+                else:
+                    locs = []
+                    for loc in no_hit_gen_locs:
+                        locs.append("{}".format(loc.is_soft_clipped))
+                    row.append(";".join(locs))
 
                 # Save
                 rows.append(row)