GPatch 0.3.4__tar.gz → 0.3.6__tar.gz

{GPatch-0.3.4/src/GPatch.egg-info → GPatch-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GPatch
-Version: 0.3.4
+Version: 0.3.6
 Summary: Assemble contigs into a chromosome-scalse pseudo-assembly using alignments to a reference sequence.
 Home-page: https://github.com/adadiehl/GPatch
 Author: Adam Diehl
@@ -40,8 +40,8 @@ Description: # GPatch
         
         ## Usage
         ```
-        usage: GPatch [-h] -q SAM/BAM -r FASTA [-x BED] [-b FILENAME] [-m N]
-                               [-d N] [-f FLOAT] [-e FLOAT]
+        usage: GPatch.py [-h] -q SAM/BAM -r FASTA [-x STR] [-b FILENAME] [-m N]
+                         [-w PATH] [-d]
         ```
         
         Starting with alignments of contigs to a reference genome, produce a chromosome-scale pseudoassembly by patching gaps between mapped contigs with sequences from the reference. Reference chromosomes with no mapped contigs are printed to output unchanged.
@@ -59,6 +59,8 @@ Description: # GPatch
         | __-x STR, --prefix STR__ | Prefix to add to output file names. Default=None |
         | __-b FILENAME, --store_final_bam FILENAME__ | Store the final set of primary contig alignments to the given file name. Default: Do not store the final BAM. |
         | __-m N, --min_qual_score N__ | Minimum mapping quality score to retain an alignment. Default=30 |
+        | __-w PATH, --whitelist PATH__ | Path to BED file containing whitelist regions: i.e., the inverse of blacklist regions. Supplying this will have the effect of excluding alignments that fall entirely within blacklist regions. Default=None |
+        | __-d, --drop_missing__ | Omit unpatched reference chromosome records from the output if no contigs map to them. Default: Unpatched chromosomes are printed to output unchanged. |
         
         
         ## Output

{GPatch-0.3.4 → GPatch-0.3.6}/README.md

@@ -32,8 +32,8 @@ Installation from the github repository is not recommended. However, if you must
 
 ## Usage
 ```
-usage: GPatch [-h] -q SAM/BAM -r FASTA [-x BED] [-b FILENAME] [-m N]
-                       [-d N] [-f FLOAT] [-e FLOAT]
+usage: GPatch.py [-h] -q SAM/BAM -r FASTA [-x STR] [-b FILENAME] [-m N]
+                 [-w PATH] [-d]
 ```
 
 Starting with alignments of contigs to a reference genome, produce a chromosome-scale pseudoassembly by patching gaps between mapped contigs with sequences from the reference. Reference chromosomes with no mapped contigs are printed to output unchanged.
@@ -51,6 +51,8 @@ Starting with alignments of contigs to a reference genome, produce a chromosome-
 | __-x STR, --prefix STR__ | Prefix to add to output file names. Default=None |
 | __-b FILENAME, --store_final_bam FILENAME__ | Store the final set of primary contig alignments to the given file name. Default: Do not store the final BAM. |
 | __-m N, --min_qual_score N__ | Minimum mapping quality score to retain an alignment. Default=30 |
+| __-w PATH, --whitelist PATH__ | Path to BED file containing whitelist regions: i.e., the inverse of blacklist regions. Supplying this will have the effect of excluding alignments that fall entirely within blacklist regions. Default=None |
+| __-d, --drop_missing__ | Omit unpatched reference chromosome records from the output if no contigs map to them. Default: Unpatched chromosomes are printed to output unchanged. |
 
 
 ## Output

{GPatch-0.3.4 → GPatch-0.3.6}/setup.py

@@ -29,7 +29,7 @@ def main():
 
     metadata = dict(
         name="GPatch",
-        version="0.3.4",
+        version="0.3.6",
         author="Adam Diehl",
         author_email="adadiehl@umich.edu",
         description="Assemble contigs into a chromosome-scalse pseudo-assembly using alignments to a reference sequence.",

{GPatch-0.3.4 → GPatch-0.3.6}/src/GPatch/GPatch.py

@@ -7,7 +7,7 @@ from Bio.Seq import Seq
 import pysam
 import random
 
-__version__ = "0.3.4"
+__version__ = "0.3.6"
 
 """
 Given a name-sorted BAM file, cluster mapped reads by name and
@@ -45,7 +45,9 @@ def contig_breakpoints_from_cigar(primary_alignments):
         chrom = contig.reference_name
         start = contig.reference_start
         end = contig.reference_end
+        #sys.stderr.write("%s\t%s\t%s\n" % (chrom, start, end))
         # Check for left and right soft-clips
+        #sys.stderr.write("%s\n%s\n" % (contig.cigartuples[0], contig.cigartuples[-1]))
         if contig.cigartuples[0][0] == 4:
             # left soft-clip
             start -= contig.cigartuples[0][1]
@@ -53,6 +55,7 @@ def contig_breakpoints_from_cigar(primary_alignments):
             # right soft-clip
             end += contig.cigartuples[-1][1]
         contig_breakpoints[contig.query_name] = [chrom, start, end, contig.query_name]
+        #sys.stderr.write("%s\n" % (contig_breakpoints))
 
     return contig_breakpoints
     
@@ -165,8 +168,8 @@ def main():
     parser.add_argument('-w', '--whitelist', metavar='PATH', type=str,
                         required=False, default=None,
                         help='Path to BED file containing whitelist regions: i.e., the inverse of blacklist regions. Supplying this will have the effect of excluding alignments that fall entirely within blacklist regions. Default=None')
-    parser.add_argument('-d', '--drop_missing', type=bool,
-                        required=False, default=False,
+    parser.add_argument('-d', '--drop_missing',
+                        required=False, default=False, action="store_true",
                         help='Omit unpatched reference chromosome records from the output if no contigs map to them. Default: Unpatched chromosomes are printed to output unchanged.')
     
     args = parser.parse_args()
@@ -265,11 +268,16 @@ def main():
         patched_seq = ""
         for contig in contigs:
             rstart = contig_breakpoints[contig.query_name][1]
+            """
+            # This introduced a one-off error! We don't need to do this
+            # because all coordinates are already in proper zero-based form.
             if rstart > 0:
                 rstart -= 1
+            """
 
             # Check for overlapping/bookended contig mappings.
             qstart = 0  # Start of contig interval to append
+            #sys.stderr.write("%s\t%s\t%s\n" % (rstart, pos, pos-rstart))
             if rstart > pos:
                 # No overlap. Append the patch, in all lower-case
                 # for easy identification.
@@ -278,7 +286,9 @@ def main():
                 patches_bed.write("%s\t%d\t%d\n" % (ref_seq.id, pos, rstart))
             else:
                 # Handle overlapping contig ends by trimming the 5' end of
-                # this contig sequence by the length of the overlap.
+                # this contig sequence by the length of the overlap. Note this
+                # evaluates to zero if contigs are bookended (i.e., pos and
+                # rstart are equal.)
                 qstart = pos - rstart
                 
             # Append the contig sequence to the patched sequence string
@@ -299,14 +309,17 @@ def main():
 
             # Update the current position in the reference sequence if the
             # end position of the current contig is 3' of the current pos.
+            #sys.stderr.write("%s\t%s\t%s\n" % (pos, contig_breakpoints[contig.query_name][2], len(ref_seq.seq)))
             if contig_breakpoints[contig.query_name][2] > pos:
                 # This should always evaluate true in the absence of nested contigs.
                 pos = contig_breakpoints[contig.query_name][2]
-            
+                
         # Once the above loop finishes, we need to add the terminal segment
         # from the reference genome.
-        patched_seq = patched_seq + ref_seq.seq[pos:len(ref_seq.seq)]
-        patches_bed.write("%s\t%d\t%d\n" % (ref_seq.id, pos, len(ref_seq.seq)))
+        if pos < len(ref_seq.seq):
+            #sys.stderr.write("%s\n" % (ref_seq.seq[pos:len(ref_seq.seq)]))
+            patched_seq = patched_seq + ref_seq.seq[pos:len(ref_seq.seq)]
+            patches_bed.write("%s\t%d\t%d\n" % (ref_seq.id, pos, len(ref_seq.seq)))
 
         # Swap in the patched sequence for the reference sequence and print the result 
         ref_seq.seq = patched_seq

{GPatch-0.3.4 → GPatch-0.3.6/src/GPatch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GPatch
-Version: 0.3.4
+Version: 0.3.6
 Summary: Assemble contigs into a chromosome-scalse pseudo-assembly using alignments to a reference sequence.
 Home-page: https://github.com/adadiehl/GPatch
 Author: Adam Diehl
@@ -40,8 +40,8 @@ Description: # GPatch
         
         ## Usage
         ```
-        usage: GPatch [-h] -q SAM/BAM -r FASTA [-x BED] [-b FILENAME] [-m N]
-                               [-d N] [-f FLOAT] [-e FLOAT]
+        usage: GPatch.py [-h] -q SAM/BAM -r FASTA [-x STR] [-b FILENAME] [-m N]
+                         [-w PATH] [-d]
         ```
         
         Starting with alignments of contigs to a reference genome, produce a chromosome-scale pseudoassembly by patching gaps between mapped contigs with sequences from the reference. Reference chromosomes with no mapped contigs are printed to output unchanged.
@@ -59,6 +59,8 @@ Description: # GPatch
         | __-x STR, --prefix STR__ | Prefix to add to output file names. Default=None |
         | __-b FILENAME, --store_final_bam FILENAME__ | Store the final set of primary contig alignments to the given file name. Default: Do not store the final BAM. |
         | __-m N, --min_qual_score N__ | Minimum mapping quality score to retain an alignment. Default=30 |
+        | __-w PATH, --whitelist PATH__ | Path to BED file containing whitelist regions: i.e., the inverse of blacklist regions. Supplying this will have the effect of excluding alignments that fall entirely within blacklist regions. Default=None |
+        | __-d, --drop_missing__ | Omit unpatched reference chromosome records from the output if no contigs map to them. Default: Unpatched chromosomes are printed to output unchanged. |
         
         
         ## Output