Skip to content

Commit

Permalink
Add support for uBAM and multisample test (genomic-medicine-sweden#51)
Browse files Browse the repository at this point in the history
Add ubam support and multisample test
  • Loading branch information
fellen31 committed Mar 28, 2024
1 parent 5ac4d93 commit 4544d11
Show file tree
Hide file tree
Showing 15 changed files with 445 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
parameters:
- ""
- "--input assets/samplesheet_multisample_bam.csv --split_fastq 250 --parallel_snv 1"
NXF_VER:
- "23.04.0"
- "latest-everything"
Expand All @@ -43,4 +46,4 @@ jobs:
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results ${{ matrix.parameters }}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Initial release of genomic-medicine-sweden/skierfe, created with the [nf-core](h

### `Added`

- Added uBAM support and multisample test [#51](https://github.com/genomic-medicine-sweden/skierfe/pull/51)
- Added Revio BAM test data [#50](https://github.com/genomic-medicine-sweden/skierfe/pull/50)
- Update template to 2.13.1 [#38](https://github.com/genomic-medicine-sweden/skierfe/pull/38)
- Update pipeline to run with a small test dataset [#35](https://github.com/genomic-medicine-sweden/skierfe/pull/35)
Expand Down
4 changes: 2 additions & 2 deletions assets/schema_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"file": {
"format": "file-path",
"type": "string",
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
"errorMessage": "FastQ file must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
"pattern": "^\\S+\\.(f(ast)?q\\.gz|bam)$",
"errorMessage": "FastQ or BAM file must be provided, cannot contain spaces and must have extension '.fq.gz', '.fastq.gz' or '.bam'"
},
"family_id": {
"type": "string",
Expand Down
35 changes: 35 additions & 0 deletions conf/modules/bam_to_fastq.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Config file for defining DSL2 per module options and publishing paths
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Available keys to override module options:
ext.args = Additional arguments appended to command in module.
ext.args2 = Second set of arguments appended to command in module (multi-tool modules).
ext.args3 = Third set of arguments appended to command in module (multi-tool modules).
ext.prefix = File name prefix for output files.
----------------------------------------------------------------------------------------
*/

process {

/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
BAM TO FASTQ
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/

withName: '.*:BAM_TO_FASTQ:.*' {
publishDir = [
enabled: false,
]
}

withName: '.*:BAM_TO_FASTQ:SAMTOOLS_FASTQ' {

// Maybe should only allow unmapped data
// Unsure why SA tag is still there after reset
ext.args = '-x SA' // samtools reset
ext.args2 = '-T \\*' // samtools fastq

}
}
5 changes: 5 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": ["modules"]
},
"samtools/fastq": {
"branch": "master",
"git_sha": "897c33d5da084b61109500ee44c01da2d3e4e773",
"installed_by": ["modules"]
},
"samtools/index": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
Expand Down
8 changes: 8 additions & 0 deletions modules/nf-core/samtools/fastq/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions modules/nf-core/samtools/fastq/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions modules/nf-core/samtools/fastq/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions modules/nf-core/samtools/fastq/samtools-fastq.diff

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions modules/nf-core/samtools/fastq/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4544d11

Please sign in to comment.