Skip to content

Commit 7cf18c4

Browse files
author
Rachel Colquhoun
committed
WIP: process_cog_uk workflow now runs
1 parent 52a20c5 commit 7cf18c4

7 files changed

Lines changed: 47 additions & 46 deletions

environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies:
2020
- r-base=3.5.1
2121
- r-networkd3
2222
- jclusterfunk
23+
- benjamincjackson::gofasta=v0.0.3
2324
- pip:
2425
- git+https://github.com/COG-UK/phylo-reports.git
2526
- git+https://github.com/cov-lineages/pangolin.git

modules/align_and_variant_call_cog_uk.nf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ process uk_minimap2_to_reference {
1717
cpus 1
1818

1919
input:
20-
file uk_fasta
20+
path uk_fasta
2121

2222
output:
2323
path "uk_alignment.sam"
@@ -39,7 +39,7 @@ process uk_get_variants {
3939
cpus 1
4040

4141
input:
42-
file uk_sam
42+
path uk_sam
4343

4444
output:
4545
path "uk.variants.csv"
@@ -64,7 +64,7 @@ process uk_get_indels {
6464
publishDir "${publish_dir}/metadata/", pattern: "*.csv", mode: 'copy'
6565

6666
input:
67-
file uk_sam
67+
path uk_sam
6868

6969
output:
7070
path "uk.insertions.csv", emit: uk_insertions
@@ -91,7 +91,7 @@ process uk_alignment {
9191
cpus 1
9292

9393
input:
94-
file uk_sam
94+
path uk_sam
9595

9696
output:
9797
path "uk_alignment.fasta"
@@ -115,7 +115,7 @@ process uk_mask_alignment {
115115
*/
116116

117117
input:
118-
file uk_alignment
118+
path uk_alignment
119119

120120
output:
121121
path "${uk_alignment.baseName}.masked.fa"
@@ -139,7 +139,7 @@ process uk_get_snps {
139139
*/
140140

141141
input:
142-
file uk_alignment
142+
path uk_alignment
143143

144144
output:
145145
path "uk.snps.csv"
@@ -159,8 +159,8 @@ process uk_type_AAs_and_dels {
159159
*/
160160

161161
input:
162-
file uk_alignment
163-
file uk_metadata
162+
path uk_alignment
163+
path uk_metadata
164164

165165
output:
166166
path "${uk_metadata.baseName}.typed.csv"
@@ -189,8 +189,8 @@ process publish_full_aligned_cog_data {
189189

190190

191191
input:
192-
file uk_alignment
193-
file uk_metadata
192+
path uk_alignment
193+
path uk_metadata
194194

195195
output:
196196
path "${uk_alignment.baseName}.matched.fa"

modules/deduplicate_cog_uk.nf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ process uk_annotate_with_unmapped_genome_completeness {
1313
*/
1414

1515
input:
16-
file uk_fasta
17-
file uk_metadata
16+
path uk_fasta
17+
path uk_metadata
1818

1919
output:
2020
path "${uk_metadata.baseName}.annotated.csv"
@@ -54,8 +54,8 @@ process uk_remove_duplicates_COGID_by_proportionN {
5454
*/
5555

5656
input:
57-
file uk_fasta
58-
file uk_metadata
57+
path uk_fasta
58+
path uk_metadata
5959

6060
output:
6161
path "${uk_fasta.baseName}.deduplicated_by_cogid.fa", emit: uk_fasta_updated
@@ -120,8 +120,8 @@ process uk_remove_duplicates_biosamplesourceid_by_date {
120120
*/
121121

122122
input:
123-
file uk_fasta
124-
file uk_metadata
123+
path uk_fasta
124+
path uk_metadata
125125

126126
output:
127127
path "${uk_fasta.baseName}.deduplicated_by_biosamplesourceid.fa", emit: uk_fasta_updated
@@ -193,8 +193,8 @@ process uk_remove_duplicates_rootbiosample_by_gaps {
193193
publishDir "${params.publish_dir}/alignments/", pattern: "*.fa", mode: 'copy', saveAs: {"cog_${params.date}_all.fasta"}
194194

195195
input:
196-
file uk_fasta
197-
file uk_metadata
196+
path uk_fasta
197+
path uk_metadata
198198

199199
output:
200200
path "${uk_fasta.baseName}.deduplicated_by_rootbiosample.fa", emit: uk_fasta_updated

modules/filter_and_trim_cog_uk.nf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ process uk_filter_low_coverage_sequences {
1515
*/
1616

1717
input:
18-
file uk_alignment
19-
file uk_metadata
18+
path uk_alignment
19+
path uk_metadata
2020

2121
output:
2222
path "${uk_alignment.baseName}.low_covg_filtered.fasta", emit: uk_fasta_updated
@@ -68,7 +68,7 @@ process uk_trim_alignment {
6868
*/
6969

7070
input:
71-
file uk_alignment
71+
path uk_alignment
7272

7373
output:
7474
path "${uk_alignment.baseName}.trimmed.fa"
@@ -108,8 +108,8 @@ process publish_filtered_aligned_cog_data {
108108
publishDir "${publish_dir}/alignments/", pattern: "*.csv", mode: 'copy', saveAs: {"cog_${params.date}_metadata.fasta"}
109109

110110
input:
111-
file uk_alignment
112-
file uk_metadata
111+
path uk_alignment
112+
path uk_metadata
113113

114114
output:
115115
path "${uk_alignment.baseName}.matched.fa"

modules/pangolin_cog_uk.nf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ process extract_sequences_for_pangolin {
1616
*/
1717

1818
input:
19-
file uk_fasta
20-
file uk_metadata
19+
path uk_fasta
20+
path uk_metadata
2121

2222
output:
2323
path "${uk_fasta.baseName}.for_pangolin.fasta", emit: pangolin_fasta
@@ -86,7 +86,7 @@ process uk_pangolin {
8686
*/
8787

8888
input:
89-
file uk_fasta
89+
path uk_fasta
9090

9191
output:
9292
path "pangolin/lineage_report.csv"
@@ -107,8 +107,8 @@ process uk_add_new_pangolin_lineages_to_metadata {
107107
*/
108108

109109
input:
110-
file uk_metadata
111-
file pangolin_csv
110+
path uk_metadata
111+
path pangolin_csv
112112

113113
output:
114114
path "${uk_metadata.baseName}.with_pangolin.csv"
@@ -155,7 +155,7 @@ workflow pangolin_cog_uk {
155155
uk_pangolin(extract_sequences_for_pangolin.out.pangolin_fasta)
156156
uk_add_new_pangolin_lineages_to_metadata(extract_sequences_for_pangolin.out.metadata_with_previous, uk_pangolin.out)
157157
emit:
158-
uk_add_new_pangolin_lineages_to_metadata.out
158+
metadata = uk_add_new_pangolin_lineages_to_metadata.out
159159
}
160160

161161

modules/preprocess_cog_uk.nf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ process uk_strip_header_digits {
1313
*/
1414

1515
input:
16-
file uk_fasta
16+
path uk_fasta
1717

1818
output:
19-
file "${uk_fasta.baseName}.header_stripped.fasta"
19+
path "${uk_fasta.baseName}.header_stripped.fasta"
2020

2121
script:
2222
"""
@@ -43,12 +43,12 @@ process uk_add_columns_to_metadata {
4343
*/
4444

4545
input:
46-
file uk_metadata
47-
file uk_accessions
48-
file uk_updated_dates
46+
path uk_metadata
47+
path uk_accessions
48+
path uk_updated_dates
4949

5050
output:
51-
file "${uk_metadata.baseName}.updated.csv"
51+
path "${uk_metadata.baseName}.updated.csv"
5252

5353
script:
5454
"""
@@ -69,9 +69,9 @@ process uk_filter_omitted_sequences {
6969
* @params uk_omissions
7070
*/
7171
input:
72-
file uk_fasta
73-
file uk_metadata
74-
file uk_omissions
72+
path uk_fasta
73+
path uk_metadata
74+
path uk_omissions
7575

7676
output:
7777
path "${uk_fasta.baseName}.omit_filtered.fa", emit: fasta
@@ -125,8 +125,8 @@ process uk_filter_on_sample_date {
125125
*/
126126

127127
input:
128-
file uk_fasta
129-
file uk_metadata
128+
path uk_fasta
129+
path uk_metadata
130130

131131
output:
132132
path "${uk_fasta.baseName}.date_filtered.fa", emit: fasta

workflows/process_cog_uk.nf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ workflow process_cog_uk {
2323
}
2424

2525
workflow {
26-
uk_fasta = file(params.uk_fasta)
27-
uk_metadata = file(params.uk_metadata)
28-
uk_accessions = file(params.uk_accessions)
26+
ch_uk_fasta = Channel.fromPath(params.uk_fasta)
27+
ch_uk_metadata = Channel.fromPath(params.uk_metadata)
28+
ch_uk_accessions = Channel.fromPath(params.uk_accessions)
2929

30-
process_cog_uk(uk_fasta,
31-
uk_metadata,
32-
uk_accessions)
30+
process_cog_uk(ch_uk_fasta,
31+
ch_uk_metadata,
32+
ch_uk_accessions)
3333
}

0 commit comments

Comments
 (0)