Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove lane after tracking in id to ensure proper merging after mapping #1221

Merged
merged 15 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Rapaselet is a delta formed by the Rapaätno river between the Bielloriehppe mas
- [#1216](https://github.com/nf-core/sarek/pull/1216) - Better test coverage for variant calling `*_all` subworkflows
- [#1217](https://github.com/nf-core/sarek/pull/1217) - Fix `groupTuple` statement for mutect2 tumor_only subworkflows
- [#1220](https://github.com/nf-core/sarek/pull/1220) - Fix channel and meta logic for `joint_mutect2` feature
- [#1221](https://github.com/nf-core/sarek/pull/1221) - Remove `lane` meta field after samplesheet validation to ensure proper merging after mapping
- [#1224](https://github.com/nf-core/sarek/pull/1224) - Update BCFTOOLS_SORT module with `--temp-dir .` added as option, which was required for Singularity
- [#1225](https://github.com/nf-core/sarek/pull/1225) - Better test coverage for all tests

Expand Down
1 change: 1 addition & 0 deletions tests/csv/3.0/fastq_single.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
patient,sex,status,sample,lane,fastq_1,fastq_2
test,XX,0,test,test_L1,https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/illumina/fastq/test_1.fastq.gz,https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/illumina/fastq/test_2.fastq.gz
test,XX,0,test,test_L2,https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/illumina/fastq/test_1.fastq.gz,https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/homo_sapiens/illumina/fastq/test_2.fastq.gz
24 changes: 12 additions & 12 deletions tests/test_aligner_bwamem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
Expand Down Expand Up @@ -48,27 +48,27 @@
# conda changes md5sums for test
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand Down
24 changes: 12 additions & 12 deletions tests/test_aligner_bwamem2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
Expand Down Expand Up @@ -48,27 +48,27 @@
# conda changes md5sums for test
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand Down
24 changes: 12 additions & 12 deletions tests/test_aligner_dragmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 75ba4376a17ca69c5134153302f82e92
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
Expand Down Expand Up @@ -61,27 +61,27 @@
# conda changes md5sums for test
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["LB0 13607 543 161 518779 6410 0 0 0.436262"]
contains: ["LB0 27214 1086 322 1037558 20017 100 0 0.687981"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: be1a800868fc1ce26711654525224e59
md5sum: b0d7d5de1e00132bb5b47e1b3d90d944
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: 2a3f0fab66518ef0786235470f1f28d0
md5sum: 02b88d7ec0ca8ff23ba688c35939fa05
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: d38ab9b0e0e551dc22919304929dd71c
md5sum: 1792d98676f597f755749f4286c5102d
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: 0d92f4c698a6476ccaf798aa31a557bc
md5sum: 590119568d091ce3a88f7fe4f43f24ff
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: d5f1c9389ecf52ba839e834780a94549
md5sum: 2e7fe057ead0622e6a2a6b0ed1832315
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: be1a800868fc1ce26711654525224e59
md5sum: b0d7d5de1e00132bb5b47e1b3d90d944
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: 2a3f0fab66518ef0786235470f1f28d0
md5sum: 02b88d7ec0ca8ff23ba688c35939fa05
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: d38ab9b0e0e551dc22919304929dd71c
md5sum: 1792d98676f597f755749f4286c5102d
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: 0d92f4c698a6476ccaf798aa31a557bc
md5sum: 590119568d091ce3a88f7fe4f43f24ff
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: d5f1c9389ecf52ba839e834780a94549
md5sum: 2e7fe057ead0622e6a2a6b0ed1832315
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand Down
36 changes: 18 additions & 18 deletions tests/test_aligner_sentieon_bwamem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
Expand Down Expand Up @@ -48,27 +48,27 @@
# conda changes md5sums for test
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand Down Expand Up @@ -127,34 +127,34 @@
- path: results/preprocessing/markduplicates/test/test.md.bam.bai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.bam
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.bam.bai
# binary changes md5sums on reruns
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand All @@ -181,34 +181,34 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
# binary changes md5sums on reruns
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: 33c7002cc7e66cbc0509bb9532ec3f1e
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: 8fcc45ab48b03c38b5200e02da63dbe1
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: a27a092f08b48648e11eb8730cba02b9
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
Expand Down
26 changes: 13 additions & 13 deletions tests/test_default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- path: results/preprocessing/markduplicates/test/test.md.cram.crai
# binary changes md5sums on reruns
- path: results/preprocessing/recal_table/test/test.recal.table
md5sum: 4ac774bf5f1157e77426fd82f5ac0fbe
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram
# binary changes md5sums on reruns
- path: results/preprocessing/recalibrated/test/test.recal.cram.crai
Expand All @@ -28,33 +28,33 @@
# conda changes md5sums for test
- path: results/reports/fastqc/test-test_L1
- path: results/reports/markduplicates/test/test.md.cram.metrics
contains: ["test 8547 767 84 523391 3882 0 0 0.385081", "1.0 767 767"]
contains: ["test 17094 1534 168 1046782 12429 197 0 0.635998", "1.0 0.999991 1171"]
- path: results/reports/mosdepth/test/test.md.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.md.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.md.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.md.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.md.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/mosdepth/test/test.recal.mosdepth.global.dist.txt
md5sum: 76fa71922a3f748e507c2364c531dfcb
md5sum: b61e1acee11a6ddf7ce3232a5948a6a0
- path: results/reports/mosdepth/test/test.recal.mosdepth.region.dist.txt
md5sum: abc5df85e302b79985627888870882da
md5sum: 1a382f98d488d2ae3df83a0d87caafc1
- path: results/reports/mosdepth/test/test.recal.mosdepth.summary.txt
md5sum: d536456436eb275159b8c6af83213d80
md5sum: 839108358878ada89e1eaddf6e0541ba
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz
md5sum: 38fe39894abe62e38f8ac214cba64f2b
md5sum: 0aaee6da65050bedcd40b9fbf0622873
- path: results/reports/mosdepth/test/test.recal.regions.bed.gz.csi
md5sum: b1c2a861f64e20a94108a6de3b76c582
md5sum: 544e02fcca548749a0af758d0a2df352
- path: results/reports/samtools/test/test.md.cram.stats
# conda changes md5sums for test
- path: results/reports/samtools/test/test.recal.cram.stats
# conda changes md5sums for test
- path: results/reports/vcftools/strelka/test/test.strelka.variants.FILTER.summary
md5sum: dd87f507da7de20d5318841af312493b
md5sum: ad417bc96d31223f61170987975d8128
- path: results/reports/vcftools/strelka/test/test.strelka.variants.TsTv.count
md5sum: fa27f678965b7cba6a92efcd039f802a
- path: results/reports/vcftools/strelka/test/test.strelka.variants.TsTv.qual
Expand Down
Loading