Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e43a511
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Jan 26, 2015
3b252a0
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Feb 4, 2015
1f2d381
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Feb 4, 2015
9f22eed
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Feb 6, 2015
c19d252
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Feb 9, 2015
676ee6c
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 9, 2015
52f9858
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Feb 12, 2015
5c555be
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 13, 2015
f879f5a
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 17, 2015
7ed9466
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 17, 2015
76ce335
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 17, 2015
9d7aaf0
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
7c6c7f5
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
6c9d85b
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
50a1563
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
35910e5
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
77b378c
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 18, 2015
237164d
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 19, 2015
6f38a94
Merge branch 'develop' of git@github.com:teharrison/MG-RAST into develop
Feb 19, 2015
8e2b03b
add env to workflows
teharrison Mar 18, 2015
2c56aff
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Mar 18, 2015
fdb8ee9
add env to task
Mar 18, 2015
f8419dd
fix env in workflows
Mar 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/MGRAST/lib/resources/inbox.pm
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,10 @@ sub demultiplex {
"cmd": {
"args": "-input=\@$fname.$seq_type -input_json=input_attr.json -output_json=output_attr.json -type=$seq_type",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["0"],
"inputs": {
Expand Down Expand Up @@ -627,21 +630,24 @@ sub pair_join {
"cmd": {
"args": "-input=\@$fname -input_json=input_attr.json -output_json=output_attr.json -type=fastq",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["3"],
"inputs": {
"$fname": {
"host": "$shock_url",
"origin": "0",
"origin": "3",
"node": "-",
"attrfile": "input_attr.json"
}
},
"outputs": {
"$fname": {
"host": "$shock_url",
"origin": "0",
"origin": "3",
"node": "-",
"type": "update",
"attrfile": "output_attr.json"
Expand Down
5 changes: 4 additions & 1 deletion src/MGRAST/workflows/demultiplex.awf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"cmd": {
"args": "-f [% file_type %] -b @[% bar_file %] -i @[% seq_file %]",
"description": "demultiplex",
"name": "demultiplex.py"
"name": "demultiplex.py",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand Down
10 changes: 8 additions & 2 deletions src/MGRAST/workflows/pair_join.awf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"cmd": {
"args": "[% retain %]-m 8 -p 10 -t . -o [% out_file %].fastq @[% p1_file %] @[% p2_file %]",
"description": "merge mate-pairs",
"name": "pairend_join.py"
"name": "pairend_join.py",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand Down Expand Up @@ -47,7 +50,10 @@
"cmd": {
"args": "-input=@[% out_file %].fastq -input_json=input_attr.json -output_json=output_attr.json -type=fastq",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["0"],
"inputs": {
Expand Down
20 changes: 16 additions & 4 deletions src/MGRAST/workflows/pair_join_demultiplex.awf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"cmd": {
"args": "[% retain %]-m 8 -p 10 -t . -r -i [% index_file %] -o [% out_file %].join.fastq @[% p1_file %] @[% p2_file %]",
"description": "merge mate-pairs",
"name": "pairend_join.py"
"name": "pairend_join.py",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand Down Expand Up @@ -51,7 +54,10 @@
"cmd": {
"args": "-r -i @[% index_file %] -p [% out_file %] -o [% out_file %].barcodes.txt",
"description": "build barcodes",
"name": "index2barcode.py"
"name": "index2barcode.py",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand All @@ -77,7 +83,10 @@
"cmd": {
"args": "-input=@[% out_file %].join.fastq -input_json=input_attr.json -output_json=output_attr.json -type=fastq",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["0"],
"inputs": {
Expand All @@ -104,7 +113,10 @@
"cmd": {
"args": "-f fastq -b @[% out_file %].barcodes.txt -i @[% out_file %].join.fastq",
"description": "demultiplex",
"name": "demultiplex.py"
"name": "demultiplex.py",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["1", "2"],
"inputs": {
Expand Down
5 changes: 4 additions & 1 deletion src/MGRAST/workflows/seq_stats.awf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"cmd": {
"args": "-input=@[% seq_file %] -input_json=input_attr.json -output_json=output_attr.json -type=[% file_type %]",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand Down
10 changes: 8 additions & 2 deletions src/MGRAST/workflows/sff_to_fastq.awf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"cmd": {
"args": "-Q @[% sff_file %] -s [% fastq_file %]",
"description": "sff to fastq",
"name": "sff_extract_0_2_8"
"name": "sff_extract_0_2_8",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": [],
"inputs": {
Expand All @@ -42,7 +45,10 @@
"cmd": {
"args": "-input=@[% fastq_file %] -input_json=input_attr.json -output_json=output_attr.json -type=fastq",
"description": "sequence stats",
"name": "awe_seq_length_stats.pl"
"name": "awe_seq_length_stats.pl",
"environ" : {
"public" : { "PERL5LIB" : "/root/pipeline/lib:/root/pipeline/conf" }
}
},
"dependsOn": ["0"],
"inputs": {
Expand Down