Skip to content

Commit

Permalink
update travis
Browse files Browse the repository at this point in the history
  • Loading branch information
urmi-21 committed Feb 24, 2020
1 parent b632c6c commit e33fdc0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,8 @@ install:
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
- cd tests
- bash build_test_env.sh
- conda activate pyrpipe_test
- cd ..
- conda install -c bioconda transdecoder
- conda install -c bioconda diamond
#use docker portculllis
- export PATH=$PATH:$PWD/portcullisDocker/



Expand Down
13 changes: 10 additions & 3 deletions pyrpipe/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def build_index(self,index_path,*args,verbose=False,quiet=False,logs=True,object



def perform_alignment(self,sra_object,out_suffix="_star",out_dir="",verbose=False,quiet=False,logs=True,objectid="NA",out_type=None,optimize=None,**kwargs):
def perform_alignment(self,sra_object,out_suffix="_star",out_dir="",verbose=False,quiet=False,logs=True,objectid="NA",out_type=None,optimize=None,threads=None,**kwargs):
"""Function to perform alignment using star and the provided SRA object.
All star output will be written to the sra_object directory by default.
Expand All @@ -445,9 +445,11 @@ def perform_alignment(self,sra_object,out_suffix="_star",out_dir="",verbose=Fals
objectid: str
Provide an id to attach with this command e.g. the SRR accession. This is useful for debugging, benchmarking and reports.
out_type: str
Out type options for star
Out type options for star: sam, sorted_bam, unsorted_bam [Default: sorted_bam]
optimize: bool
If true optimize maping parameters based on read length
If true optimize maping parameters based on read length [Default: True]
threads: int
Num threads to use. If supplied will override threads supplied during __init__
kwargs: dict
Options to pass to STAR. This will override the existing options in self.passed_args_dict (only replace existing arguments and not replace all the arguments).
Expand All @@ -456,6 +458,7 @@ def perform_alignment(self,sra_object,out_suffix="_star",out_dir="",verbose=Fals
:rtype: string
"""


if not out_dir:
out_dir=sra_object.location
else:
Expand All @@ -472,6 +475,10 @@ def perform_alignment(self,sra_object,out_suffix="_star",out_dir="",verbose=Fals
#add out dir
newOpts["--outFileNamePrefix"]=out_dir+"/"

#determine threads
#use



#add input files to kwargs, overwrite kwargs with newOpts
mergedOpts={**kwargs,**newOpts}
Expand Down

0 comments on commit e33fdc0

Please sign in to comment.