Skip to content

Commit 466de80

Browse files
committed
Contribute and install fastq_subsample_fq_salmon subworkflow from nf-core/modules
1 parent c652779 commit 466de80

File tree

5 files changed

+73
-12
lines changed

5 files changed

+73
-12
lines changed

conf/modules.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ process {
182182
]
183183
}
184184

185-
withName: '.*:FASTQ_SAMPLE_INFER_STRANDEDNESS_FQ_SALMON:SALMON_QUANT' {
185+
withName: '.*:FASTQ_SUBSAMPLE_FQ_SALMON:SALMON_QUANT' {
186186
ext.args = '--skipQuant'
187187
publishDir = [
188188
path: { "${params.outdir}/sample_fastq/salmon" },

modules.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"fq/subsample": {
3535
"branch": "master",
3636
"git_sha": "ad462aa294faf9a8c42688a08daf81a580594f70",
37-
"installed_by": ["modules"]
37+
"installed_by": ["modules", "fastq_subsample_fq_salmon"]
3838
},
3939
"gffread": {
4040
"branch": "master",
@@ -134,7 +134,7 @@
134134
"salmon/quant": {
135135
"branch": "master",
136136
"git_sha": "94b06f1683ddf893cf06525f6e7f0573ad8fbf83",
137-
"installed_by": ["modules"]
137+
"installed_by": ["modules", "fastq_subsample_fq_salmon"]
138138
},
139139
"samtools/flagstat": {
140140
"branch": "master",
@@ -267,6 +267,11 @@
267267
"branch": "master",
268268
"git_sha": "b51a69e30973c71950225c817ad07a3337d22c40",
269269
"installed_by": ["subworkflows"]
270+
},
271+
"fastq_subsample_fq_salmon": {
272+
"branch": "master",
273+
"git_sha": "0098bc93f6219c6194f443f0feb089ba83717384",
274+
"installed_by": ["subworkflows"]
270275
}
271276
}
272277
}

subworkflows/local/fastq_sample_infer_strandedness_fq_salmon.nf renamed to subworkflows/nf-core/fastq_subsample_fq_salmon/main.nf

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

subworkflows/nf-core/fastq_subsample_fq_salmon/meta.yml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workflows/rnaseq.nf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ include { ALIGN_STAR } from '../subworkflows/local/align_star'
113113
include { QUANTIFY_RSEM } from '../subworkflows/local/quantify_rsem'
114114
include { QUANTIFY_SALMON as QUANTIFY_STAR_SALMON } from '../subworkflows/local/quantify_salmon'
115115
include { QUANTIFY_SALMON as QUANTIFY_SALMON } from '../subworkflows/local/quantify_salmon'
116-
include { FASTQ_SAMPLE_INFER_STRANDEDNESS_FQ_SALMON } from '../subworkflows/local/fastq_sample_infer_strandedness_fq_salmon.nf'
117116

118117
/*
119118
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -137,6 +136,7 @@ include { CUSTOM_DUMPSOFTWAREVERSIONS } from '../modules/nf-core/custom/dumpsoft
137136
//
138137
// SUBWORKFLOW: Consisting entirely of nf-core/modules
139138
//
139+
include { FASTQ_SUBSAMPLE_FQ_SALMON } from '../subworkflows/nf-core/fastq_subsample_fq_salmon/main'
140140
include { FASTQ_FASTQC_UMITOOLS_TRIMGALORE } from '../subworkflows/nf-core/fastq_fastqc_umitools_trimgalore/main'
141141
include { FASTQ_ALIGN_HISAT2 } from '../subworkflows/nf-core/fastq_align_hisat2/main'
142142
include { BAM_SORT_STATS_SAMTOOLS } from '../subworkflows/nf-core/bam_sort_stats_samtools/main'
@@ -231,15 +231,15 @@ workflow RNASEQ {
231231
//
232232
// SUBWORKFLOW: Sub-sample FastQ files and pseudo-align with Salmon to auto-infer strandedness
233233
//
234-
FASTQ_SAMPLE_INFER_STRANDEDNESS_FQ_SALMON (
234+
FASTQ_SUBSAMPLE_FQ_SALMON (
235235
ch_strand_fastq.auto_strand,
236236
PREPARE_GENOME.out.salmon_index,
237237
ch_dummy_file,
238238
PREPARE_GENOME.out.gtf
239239
)
240-
ch_versions = ch_versions.mix(FASTQ_SAMPLE_INFER_STRANDEDNESS_FQ_SALMON.out.versions)
240+
ch_versions = ch_versions.mix(FASTQ_SUBSAMPLE_FQ_SALMON.out.versions)
241241

242-
FASTQ_SAMPLE_INFER_STRANDEDNESS_FQ_SALMON
242+
FASTQ_SUBSAMPLE_FQ_SALMON
243243
.out
244244
.json_info
245245
.join(ch_strand_fastq.auto_strand)

0 commit comments

Comments
 (0)