Skip to content

Commit 2b98104

Browse files
committed
update all other processes to dsl 2 syntax
1 parent eddf4e5 commit 2b98104

14 files changed

Lines changed: 21 additions & 53 deletions

File tree

tools/extract-files-from-tarball/extract-files-from-tarball.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.tarball = ""
2727
params.pattern = ""

tools/extract-files-from-tarball/tests/checker.nf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.tarball = "data/test.caveman.tgz"
2727
params.pattern = "flagged.muts"
2828

29-
include extractFilesFromTarball from "../extract-files-from-tarball"
29+
include { extractFilesFromTarball } from "../extract-files-from-tarball"
3030

3131
workflow {
3232
main:
@@ -35,8 +35,4 @@ workflow {
3535
params.pattern
3636
)
3737

38-
publish:
39-
extractFilesFromTarball.out.output_file to: 'outdir', overwrite: true
40-
extractFilesFromTarball.out.output_file_index to: 'outdir', overwrite: true
41-
extractFilesFromTarball.out.extracted_files to: 'outdir', overwrite: true
4238
}

tools/payload-gen-dna-alignment/payload-gen-dna-alignment.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Junjun Zhang <junjun.zhang@oicr.on.ca>
2424
*/
2525

26-
nextflow.preview.dsl=2
26+
nextflow.enable.dsl=2
2727
version = '0.3.1.0'
2828

2929
params.files_to_upload = ""

tools/payload-gen-dna-alignment/tests/checker.nf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
* Junjun Zhang <junjun.zhang@oicr.on.ca>
2424
*/
2525

26-
nextflow.preview.dsl=2
26+
nextflow.enable.dsl=2
2727

2828
params.files_to_upload = ""
2929
params.seq_experiment_analysis = ""
3030
params.read_group_ubam_analysis = "NO_FILE"
3131
params.wf_name = ""
3232
params.wf_version = ""
3333

34-
include payloadGenDnaAlignment from "../payload-gen-dna-alignment" params(params)
34+
include { payloadGenDnaAlignment } from "../payload-gen-dna-alignment" params(params)
3535

3636
workflow {
3737
main:
@@ -42,7 +42,4 @@ workflow {
4242
params.wf_name,
4343
params.wf_version
4444
)
45-
publish:
46-
payloadGenDnaAlignment.out.payload to: 'outdir', overwrite: true
47-
payloadGenDnaAlignment.out.alignment_files to: 'outdir', overwrite: true
4845
}

tools/payload-gen-read-group-ubam/payload-gen-read-group-ubam.nf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Junjun Zhang <junjun.zhang@oicr.on.ca>
2323
*/
2424

25-
nextflow.preview.dsl=2
25+
nextflow.enable.dsl=2
2626
version = "0.1.2.0"
2727

2828
params.sequencing_experiment_analysis = ""
@@ -68,7 +68,4 @@ workflow {
6868
params.wf_short_name,
6969
params.wf_version
7070
)
71-
72-
publish:
73-
payloadGenReadGroupUbam.out.payload to: 'outdir', overwrite: true
7471
}

tools/payload-gen-read-group-ubam/tests/checker.nf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.sequencing_experiment_analysis = ""
2727
params.ubam = ""
2828
params.wf_name = ""
2929
params.wf_short_name = ""
3030
params.wf_version = ""
3131

32-
include "../payload-gen-read-group-ubam" params(params)
32+
include {payloadGenReadGroupUbam} from "../payload-gen-read-group-ubam" params(params)
3333

3434

3535
workflow {
@@ -41,7 +41,4 @@ workflow {
4141
params.wf_short_name,
4242
params.wf_version
4343
)
44-
45-
publish:
46-
payloadGenReadGroupUbam.out.payload to: 'outdir', overwrite: true
4744
}

tools/payload-gen-seq-experiment/payload-gen-seq-experiment.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Author Linda Xiang <linda.xiang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525
version = '0.1.3.0'
2626

2727
params.user_submit_metadata = ""

tools/payload-gen-seq-experiment/tests/checker.nf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.user_submit_metadata = ""
2727
params.wf_name = ""
2828
params.wf_short_name = ""
2929
params.wf_version = ""
3030

31-
include "../payload-gen-seq-experiment" params(params)
31+
include {payloadGenSeqExperiment} from "../payload-gen-seq-experiment" params(params)
3232

3333
workflow {
3434
main:
@@ -39,6 +39,4 @@ workflow {
3939
params.wf_version,
4040
'ok'
4141
)
42-
publish:
43-
payloadGenSeqExperiment.out.payload to: 'outdir', mode: 'copy', overwrite: true
4442
}

tools/payload-generation/payload-generation.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.bundle_type = ""
2727
params.payload_schema_version = ""

tools/payload-generation/tests/checker.nf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* author Junjun Zhang <junjun.zhang@oicr.on.ca>
2222
*/
2323

24-
nextflow.preview.dsl=2
24+
nextflow.enable.dsl=2
2525

2626
params.bundle_type = "dna_alignment"
2727
params.payload_schema_version = "0.1.0-rc.2"
@@ -35,7 +35,7 @@ params.analysis_input_payload = [
3535
params.wf_short_name = ""
3636
params.wf_version = ""
3737

38-
include "../payload-generation" params(params)
38+
include {payloadGeneration; getSecondaryFile} from "../payload-generation" params(params)
3939

4040
Channel
4141
.fromPath(params.analysis_input_payload, checkIfExists: false)
@@ -53,6 +53,4 @@ workflow {
5353
params.wf_short_name,
5454
params.wf_version
5555
)
56-
publish:
57-
payloadGeneration.out.payload to: 'outdir', mode: 'copy', overwrite: true
5856
}

0 commit comments

Comments
 (0)