Skip to content

Commit 3e8b0c1

Browse files
authored
Remove pytest-workflow tests for modules covered by nf-test (#4521)
* Add first pass at the script * rmdir => rm -rf Never used rmdir before * Remove pytest-workflow tests for modules covered by nf-test * Use yq to remove tags * ci: Remove modules that didn't get their tags removed * Copy over fastqc tests todo * chore: Bump snapshot for fastqc
1 parent 3aaf92f commit 3e8b0c1

File tree

281 files changed

+87
-6867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+87
-6867
lines changed

.github/remove_pytest.bash

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env cached-nix-shell
2+
#! nix-shell -i bash -p fd yq-go
3+
4+
5+
# Find modules that have a tests directory
6+
tested=$(fd main.nf.test modules/)
7+
8+
for module in $tested; do
9+
clean=$(dirname $module | sed 's|/tests||' | sed 's|modules/nf-core/||')
10+
yq -i "del(.${clean})" tests/config/pytest_modules.yml
11+
# rm -rf "tests/${clean}"
12+
done

modules/nf-core/fastqc/tests/main.nf.test

+68
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,72 @@ nextflow_process {
3838
)
3939
}
4040
}
41+
// TODO
42+
// //
43+
// // Test with paired-end data
44+
// //
45+
// workflow test_fastqc_paired_end {
46+
// input = [
47+
// [id: 'test', single_end: false], // meta map
48+
// [
49+
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true),
50+
// file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)
51+
// ]
52+
// ]
53+
54+
// FASTQC ( input )
55+
// }
56+
57+
// //
58+
// // Test with interleaved data
59+
// //
60+
// workflow test_fastqc_interleaved {
61+
// input = [
62+
// [id: 'test', single_end: false], // meta map
63+
// file(params.test_data['sarscov2']['illumina']['test_interleaved_fastq_gz'], checkIfExists: true)
64+
// ]
65+
66+
// FASTQC ( input )
67+
// }
68+
69+
// //
70+
// // Test with bam data
71+
// //
72+
// workflow test_fastqc_bam {
73+
// input = [
74+
// [id: 'test', single_end: false], // meta map
75+
// file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true)
76+
// ]
77+
78+
// FASTQC ( input )
79+
// }
80+
81+
// //
82+
// // Test with multiple samples
83+
// //
84+
// workflow test_fastqc_multiple {
85+
// input = [
86+
// [id: 'test', single_end: false], // meta map
87+
// [
88+
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true),
89+
// file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true),
90+
// file(params.test_data['sarscov2']['illumina']['test2_1_fastq_gz'], checkIfExists: true),
91+
// file(params.test_data['sarscov2']['illumina']['test2_2_fastq_gz'], checkIfExists: true)
92+
// ]
93+
// ]
94+
95+
// FASTQC ( input )
96+
// }
97+
98+
// //
99+
// // Test with custom prefix
100+
// //
101+
// workflow test_fastqc_custom_prefix {
102+
// input = [
103+
// [ id:'mysample', single_end:true ], // meta map
104+
// file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true)
105+
// ]
106+
107+
// FASTQC ( input )
108+
// }
41109
}

subworkflows/nf-core/fastq_fastqc_umitools_fastp/tests/main.nf.test.snap

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/config/pytest_modules.yml

-16
Original file line numberDiff line numberDiff line change
@@ -495,10 +495,6 @@ canu:
495495
- modules/nf-core/canu/**
496496
- tests/modules/nf-core/canu/**
497497

498-
cat/fastq:
499-
- modules/nf-core/cat/fastq/**
500-
- tests/modules/nf-core/cat/fastq/**
501-
502498
cdhit/cdhitest:
503499
- modules/nf-core/cdhit/cdhitest/**
504500
- tests/modules/nf-core/cdhit/cdhitest/**
@@ -1015,10 +1011,6 @@ fastk/merge:
10151011
- modules/nf-core/fastk/merge/**
10161012
- tests/modules/nf-core/fastk/merge/**
10171013

1018-
fastqc:
1019-
- modules/nf-core/fastqc/**
1020-
- tests/modules/nf-core/fastqc/**
1021-
10221014
fasttree:
10231015
- modules/nf-core/fasttree/**
10241016
- tests/modules/nf-core/fasttree/**
@@ -2971,10 +2963,6 @@ samtools/reheader:
29712963
- modules/nf-core/samtools/reheader/**
29722964
- tests/modules/nf-core/samtools/reheader/**
29732965

2974-
samtools/sort:
2975-
- modules/nf-core/samtools/sort/**
2976-
- tests/modules/nf-core/samtools/sort/**
2977-
29782966
samtools/view:
29792967
- modules/nf-core/samtools/view/**
29802968
- tests/modules/nf-core/samtools/view/**
@@ -3244,10 +3232,6 @@ smoove/call:
32443232
- modules/nf-core/smoove/call/**
32453233
- tests/modules/nf-core/smoove/call/**
32463234

3247-
snakemake:
3248-
- modules/nf-core/snakemake/**
3249-
- tests/modules/nf-core/snakemake/**
3250-
32513235
snapaligner/align:
32523236
- modules/nf-core/snapaligner/align/**
32533237
- tests/modules/nf-core/snapaligner/align/**

tests/modules/nf-core/abricate/run/main.nf

-15
This file was deleted.

tests/modules/nf-core/abricate/run/nextflow.config

-5
This file was deleted.

tests/modules/nf-core/abricate/run/test.yml

-10
This file was deleted.

tests/modules/nf-core/abricate/summary/main.nf

-21
This file was deleted.

tests/modules/nf-core/abricate/summary/nextflow.config

-5
This file was deleted.

tests/modules/nf-core/abricate/summary/test.yml

-14
This file was deleted.

tests/modules/nf-core/art/illumina/main.nf

-31
This file was deleted.

tests/modules/nf-core/art/illumina/nextflow.config

-12
This file was deleted.

tests/modules/nf-core/art/illumina/test.yml

-58
This file was deleted.

tests/modules/nf-core/assemblyscan/main.nf

-13
This file was deleted.

tests/modules/nf-core/assemblyscan/nextflow.config

-5
This file was deleted.

tests/modules/nf-core/assemblyscan/test.yml

-7
This file was deleted.

0 commit comments

Comments
 (0)