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

Replace nfcore modules #478

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b592c86
Install gatk4 modules
FriederikeHanssen Dec 22, 2021
aa332f3
update gatk4 modules with interval changes
FriederikeHanssen Dec 23, 2021
f17c203
update gatk4 modules with interval changes
FriederikeHanssen Dec 23, 2021
13519f4
Replace gatk4 local modules with nf-core modules
FriederikeHanssen Dec 23, 2021
a7d575d
Merge remote-tracking branch 'origin/gatk4_nfcore' into gatk4_nfcore
FriederikeHanssen Dec 23, 2021
bac2131
Fix CI tests, passing locally
FriederikeHanssen Dec 23, 2021
c1c0fab
Fix skipmd CI tests, passing locally
FriederikeHanssen Dec 23, 2021
c6a0ffb
weird test pass lcoally, checking remaining CI test
FriederikeHanssen Dec 23, 2021
94df2ff
why is the recal table not on GHA but locally
FriederikeHanssen Dec 23, 2021
cb12450
Revert basecalibrator changes to see if that fixes it
FriederikeHanssen Dec 23, 2021
7728ae5
Fix linting
FriederikeHanssen Dec 23, 2021
f8b6873
Change prefix, hopefully fixes publishing
FriederikeHanssen Dec 23, 2021
da7e4c6
Replace suffix annotation
FriederikeHanssen Dec 23, 2021
a0aa01b
use released nf-core version instead of dev for linting
FriederikeHanssen Dec 23, 2021
62b6980
Delete local gatk4 modules, if avail in nf-core
FriederikeHanssen Dec 29, 2021
c2ef34d
Delete local gatk4 modules, if avail in nf-core
FriederikeHanssen Dec 29, 2021
b6ec73c
Revert "Delete local gatk4 modules, if avail in nf-core"
FriederikeHanssen Dec 29, 2021
e168022
Revert "Delete local gatk4 modules, if avail in nf-core"
FriederikeHanssen Dec 29, 2021
8c63aee
Remove local applybqsr
FriederikeHanssen Dec 29, 2021
b88ce74
Revert removal of applybqsr lcoal
FriederikeHanssen Dec 29, 2021
141227a
Revert removal of applybqsr lcoal
FriederikeHanssen Dec 29, 2021
0e62a91
Remove local baserecak
FriederikeHanssen Dec 29, 2021
830321a
Remove local gatherbqsr
FriederikeHanssen Dec 29, 2021
f5f4b42
Remove local genotypegvcf
FriederikeHanssen Dec 29, 2021
72b6191
Revert removal
FriederikeHanssen Dec 29, 2021
1a64cb6
Remove more gatk4
FriederikeHanssen Dec 29, 2021
0ef0cfa
Remove more gatk4
FriederikeHanssen Dec 29, 2021
3600052
Replace gatk4 modules
FriederikeHanssen Dec 29, 2021
3908738
Fix typo
FriederikeHanssen Dec 29, 2021
785ee37
more replacements
FriederikeHanssen Dec 29, 2021
7f8a537
more replacements
FriederikeHanssen Dec 29, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install nf-core git+https://github.com/nf-core/tools.git@dev
pip install nf-core

- name: Run nf-core lint
env:
Expand Down
10 changes: 6 additions & 4 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ if (('markduplicates' in params.use_gatk_spark) && (!params.skip_markduplicates)
// MARKDUPLICATES
process {
withName: 'GATK4_ESTIMATELIBRARYCOMPLEXITY' {
ext.suffix = '.md'
ext.prefix = {"${meta.id}.md"}
publishDir = [
path: { "${params.outdir}/preprocessing/${meta.id}/markduplicates" },
enabled: true,
Expand All @@ -176,7 +176,7 @@ process {
}
withName: 'GATK4_MARKDUPLICATES' {
ext.args = '-REMOVE_DUPLICATES false -VALIDATION_STRINGENCY LENIENT'
ext.suffix = '.md'
ext.prefix = {"${meta.id}.md"}
publishDir = [
path: { "${params.outdir}/preprocessing/${meta.id}/markduplicates" },
enabled: false
Expand Down Expand Up @@ -228,15 +228,17 @@ process {
publishDir = [
path: { "${params.outdir}/preprocessing/${meta.id}/recal_table" },
enabled: true,
pattern: "*recal.table"
mode: 'copy',
pattern: "*.table"
]
ext.prefix = {"${meta.id}.recal"}
}
}

// RECALIBRATE
process {
withName: 'APPLYBQSR|APPLYBQSR_SPARK' {
ext.suffix = '.recal'
ext.prefix = {"${meta.id}.recal"}
publishDir = [ enabled: false ]
}
withName: 'SAMTOOLS_MERGE_CRAM' {
Expand Down
26 changes: 25 additions & 1 deletion modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,32 @@
"freebayes": {
"git_sha": "9d0cad583b9a71a6509b754fdf589cbfbed08961"
},
"gatk4/applybqsr": {
"git_sha": "a6e0629e2430a9d4061ddc8afdf4cff8c93080b5"
},
"gatk4/baserecalibrator": {
"git_sha": "a6e0629e2430a9d4061ddc8afdf4cff8c93080b5"
},
"gatk4/createsequencedictionary": {
"git_sha": "7389963d5cb18f81c10dff128c510e518ee4f0f6"
"git_sha": "50eafb19c689bca7747a6d44b8e7a555ba172f4b"
},
"gatk4/estimatelibrarycomplexity": {
"git_sha": "50eafb19c689bca7747a6d44b8e7a555ba172f4b"
},
"gatk4/gatherbqsrreports": {
"git_sha": "50eafb19c689bca7747a6d44b8e7a555ba172f4b"
},
"gatk4/genotypegvcfs": {
"git_sha": "a6e0629e2430a9d4061ddc8afdf4cff8c93080b5"
},
"gatk4/haplotypecaller": {
"git_sha": "a6e0629e2430a9d4061ddc8afdf4cff8c93080b5"
},
"gatk4/markduplicates": {
"git_sha": "50eafb19c689bca7747a6d44b8e7a555ba172f4b"
},
"gatk4/mutect2": {
"git_sha": "50eafb19c689bca7747a6d44b8e7a555ba172f4b"
},
"manta/germline": {
"git_sha": "9d0cad583b9a71a6509b754fdf589cbfbed08961"
Expand Down
50 changes: 0 additions & 50 deletions modules/local/gatk4/genotypegvcf/main.nf

This file was deleted.

52 changes: 0 additions & 52 deletions modules/local/gatk4/haplotypecaller/main.nf

This file was deleted.

60 changes: 0 additions & 60 deletions modules/local/gatk4/mutect2/merge_stats/main.nf

This file was deleted.

41 changes: 0 additions & 41 deletions modules/local/gatk4/mutect2/merge_stats/meta.yml

This file was deleted.

61 changes: 0 additions & 61 deletions modules/local/gatk4/mutect2/somatic/main.nf

This file was deleted.

41 changes: 0 additions & 41 deletions modules/local/gatk4/mutect2/somatic/meta.yml

This file was deleted.

Loading