Commit graph

2499 commits

Author SHA1 Message Date
Francesco L
a68c563e54
Added UMI sub-workflow (#1098)
* added code for subworkflow fgbio call umi consensus

* ironing out a few typos etc

* fixing last things

* fixed md5sum - lets see if it changes

* removing file accidentally deleted

* tidy indents

* added bwamem2 alternative

* fixed entry for both tests

* changed name second test workflow entry

* fixed workflow entry names

* fixed md5sum for file generated with bwamem2

* added syntax new DSL2

* added new config location in test command line

* added new config location in test command line

* use of prefix instead of suffix because modules have been changed in this way

* explicit alias to bwa mem1 to avoid confusion

* removed param that should be an ext optional argument in fgbio groupreadsbyumi

* missing colon in config

* missing colon in module config too

* order list alphabetically

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* remove params from body

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* improving readability of input structure

Co-authored-by: Mahesh Binzer-Panchal <mahesh.binzer-panchal@nbis.se>

* reverting to mandatory input

* fixed tests and workflow take values

* remove param

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* simplify tests params

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* formatting inputs for readability

* factoring in changes to bwamem2_mem and bwa_mem sort/view inputs

* updating test md5sum for grouped file following code update in bwamem

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
Co-authored-by: Maxime U. Garcia <max.u.garcia@gmail.com>
Co-authored-by: Mahesh Binzer-Panchal <mahesh.binzer-panchal@nbis.se>
2021-12-09 11:16:40 +01:00
Maxime U. Garcia
37c5cb495d
feat: add original input as optional output channel (#1147) 2021-12-09 11:04:53 +01:00
FriederikeHanssen
a9dd46f010
add gatk4/gatherbqsr (#1130)
* nf-core modules create

* add module files

* indent

* remove templte code

* manually revert pytest changes from tools

* manually revert pytest changes from tools

* add include statement back in

Co-authored-by: Maxime U. Garcia <max.u.garcia@gmail.com>
2021-12-08 23:43:36 +01:00
Maxime U. Garcia
ca3ae9ff4f
feat: update dragmap to follow new bwa/mem + bwamem2/mem logic (#1146) 2021-12-08 23:19:37 +01:00
Maxime U. Garcia
1765225042
Add new boolean sort_bam as input to be able to chose between sort and view in bwamem and bwamem2mem (#1125)
* feat: view is now in args2 so we can use sort

* forgot one split_cpus

* feat: update with new logic

* fix: add more info

* fix: remove split_cpus logic
2021-12-08 14:31:27 +00:00
Maxime U. Garcia
31d4099f38
Add subworkflows for ensemblvep and snpeff (#1124)
* greatly simplify syntax

* feat: add subworkflows to annotate (+ bgzip/tabix index) with ensemblvep and snpeff

* feat: get versions from all tools

* add commented infor for new annotation modules
2021-12-07 17:12:35 +01:00
FriederikeHanssen
7389963d5c
Add memory stuff to all gatk4 modules (#1122)
* Add memory stuff to all gatj4 modules

* Add removed input line back in

* revert script section
2021-12-07 15:22:24 +01:00
Mahesh Binzer-Panchal
d473a247d2
Replace remaining task.ext.suffix with task.ext.prefix (#1117)
* Replace remaining task.ext.suffix with task.ext.prefix
2021-12-07 15:00:43 +01:00
Maxime U. Garcia
3b366c7c6a
greatly simplify syntax (#1121) 2021-12-07 11:18:12 +01:00
Maxime U. Garcia
6510a7ff4f
feat: add meta.id tag (#1116)
* feat: add meat.id tag

* fix: actually call the right container for singularity
2021-12-07 10:30:35 +01:00
FriederikeHanssen
7006699ff8
Update version & prefix (#1120)
* Update version & prefix

* Fix indentation
2021-12-07 10:22:32 +01:00
Maxime U. Garcia
e22966ce74
feat: emited channel should be gz_tbi and not only tbi (#1118) 2021-12-07 10:12:58 +01:00
Maxime U. Garcia
98b024c0e4
Fix syntax for extra containers for ensemblvep and snpeff (#1105)
* fix: correct syntax for task.ext.use_cache

* Apply suggestions from code review

* fix: simplify logic

* fix: update to new syntax
2021-12-06 12:59:49 +01:00
Maxime Borry
e0aa89141f
Add meta information to samtools/faidx (#1114)
* add meta to samtools/faidx
2021-12-06 11:37:04 +01:00
Edmund Miller
f3ffa69b8d
Dragmap (#1108)
* feat(dragmap): Add initial hastable module

* feat(dragmap): Add initial align module

* test(dragmap): Remove md5sum

Forgot sam files have a header. Might pipe this through samtools.

* build(dragmap): Add mulled container

* chore(dragmap): Update prefix

* feat(dragmap): Output a bam file

* feat(dragmap): Add log files

* Update modules/dragmap/align/meta.yml

Co-authored-by: Jose Espinosa-Carrasco <kadomu@gmail.com>
2021-12-06 09:56:41 +01:00
tamuanand
cd94731789
Update meta.yml by fixing html pattern expected (#1113)
Fixed html pattern typo:

Before: pattern: "*.thml"

After fix: pattern: "*.html"
2021-12-05 21:45:09 +00:00
Edmund Miller
e2ba70ed9a
Add Cell Ranger mkfastq, mkgtf, and count (#979)
* feat(cellranger): Add initial count module

Co-authored-by: Gisela Gabernet <gisela.gabernet@gmail.com>

* feat(cellranger): Add mkgtf module

* test(cellranger): Fix count test with mkgtf

* fix(cellranger): Generalize gtf attribute filters

* chore: Add .gitignore for cellranger tar

* build(cellranger): Update dockerfile

https://joshtronic.com/2021/09/12/fixed-repository-debian-security-buster-updates-changed-suite-from-stable-to-oldstable/

* Apply suggestions from code review

Co-authored-by: Gisela Gabernet <gisela.gabernet@gmail.com>

* Apply suggestions from code review

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/cellranger/mkgtf/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* style: Capitalize README

* test(cellranger): Update pytest_modules

* feat(cellranger): Add initial mkfastq module

* ci: Update pytest modules

* refactor(cellranger): Update modules to new syntax

* docs(cellranger): Update meta files

There is some terrible copy-pasting going on.

* fix(cellranger): Add args

Co-authored-by: Gisela Gabernet <gisela.gabernet@gmail.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-12-02 14:27:20 +00:00
Harshil Patel
9d0cad583b
Change syntax from task.ext.suffix to tast.ext.prefix in all modules (#1110)
* Add comment line for consistency

* Remove all functions.nf

* Remove include functions.nf and publishDir options

* Replace options.args3 with task.ext.args3 - 3 modules

* Replace options.args3 with task.ext.args3 - 17 modules

* Replace {task.cpus} with task.cpus

* Replace off on off off off off off off off on off on off on off off off on off off off on on off off off on on off off off off off off off on off off off off on off on on off off off on on on on off off off on off on on off on on off off on on on off on on off on off off off off on off off off on off off on off on off off off on on off on off on off off on off off off on off off off on off off off off on off off off on on on off on on off off on off on on on off on on off on on on off off off off off on on off off on off off off off off on off off on on off on on off on off off off on off off off off on on off on off off on off off on off on off off off off off off off off on on off on off off off.args with

* Add def args = task.ext.args line to all modules in script section

* Replace options.args with args and args_list

* Initialise args2 and args3 properly

* Replace container syntax

* Revert container changes for cellranger/mkref

* Replace getProcessName in all modules

* Replace getSoftwareName in all modules

* Unify modules using VERSION variable

* Replae options.suffix with task.ext.suffix

* Remove NF version restriction for CI

* Bump NF version in README

* Replace task.process.tokenize logic with task.process

* Minor tweaks to unify syntax in tests main.nf

* Add a separate nextflow.config for each module

* Transfer remaining module options to nextflow.config

* Remove addParams from tests main.nf

* Remove TODO statements

* Use -c to import module specific config

* Bump NF version to 21.10.3

* Fix tests for artic/minion

* Fix broken publishDir syntax

* Standardise and fix obvious failing module tests

* Remove kronatools to krona

* Comment out tags in subworkflow test.yml

* Fix failing module tests

* Add consistent indentation to nextflow.config

* Comment out subworklow definitions

* Fix kallistobustools/ref

* Fix rmarkdownnotebook

* Fix jupyternotebook

* Quote task.process

* Add plink2/vcf to pytest_modules.yml

* Remove NF_CORE_MODULES_TEST from pytest CI

* Fix more tests

* Move bacteroides_fragilis to prokaryotes folder

* Fix cooler merge tests

* Fix kallistobustools/count tests

* Fix kallistobustools/ref tests

* Update test_10x_1_fastq_gz file for kallistobustools/count tests

* Fix bcftools/query tests

* Fix delly/call tests

* Fix cooler/zoomify tests

* Fix csvtk/split tests

* Fix gatk4/intervallisttools tests

* Fix gatk4/variantfiltration

* Fix pydamage/filter tests

* Fix test data for unicycler

* Fix gstama/collapse module

* Fix leehom tests

* Fix metaphlan3 tests

* Fix pairtools/select tests

* Update nextflow.config

* Update nextflow.config

* feat: update syntax

* Fix arriba tests

* Fix more failing tests

* Update test syntax

* Remove comments from tests nextflow.config

* Apply suggestions from code review

* Fix kallistobustools/count module

* Update dumpsoftwareversions module

* Update custom/dumpsoftwareversions

* Add args2 to untar module

* Update leftover modules

* Remove last remaining addParams

* Change syntax from task.ext.suffix to tast.ext.prefix

* Change nextflow.config in all tests to use ext.prefix instead of ext.suffix

Co-authored-by: JoseEspinosa <kadomu@gmail.com>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: MaxUlysse <max.u.garcia@gmail.com>
2021-12-02 12:39:55 +00:00
louperelo
1f8f86b793
takes gunzip out of fargene main.nf (#1090)
* takes gunzip out of fargene main.nf

* update definition of input

* options.args -> args

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
2021-11-29 14:32:23 +01:00
Harshil Patel
20d8250d9f
Update all modules to new NF DSL2 syntax (#1099)
* Add comment line for consistency

* Remove all functions.nf

* Remove include functions.nf and publishDir options

* Replace options.args3 with task.ext.args3 - 3 modules

* Replace options.args3 with task.ext.args3 - 17 modules

* Replace {task.cpus} with task.cpus

* Replace off on off off off off off off off on off on off on off off off on off off off on on off off off on on off off off off off off off on off off off off on off on on off off off on on on on off off off on off on on off on on off off on on on off on on off on off off off off on off off off on off off on off on off off off on on off on off on off off on off off off on off off off on off off off off on off off off on on on off on on off off on off on on on off on on off on on on off off off off off on on off off on off off off off off on off off on on off on on off on off off off on off off off off on on off on off off on off off on off on off off off off off off off off on on off on off off off.args with

* Add def args = task.ext.args line to all modules in script section

* Replace options.args with args and args_list

* Initialise args2 and args3 properly

* Replace container syntax

* Revert container changes for cellranger/mkref

* Replace getProcessName in all modules

* Replace getSoftwareName in all modules

* Unify modules using VERSION variable

* Replae options.suffix with task.ext.suffix

* Remove NF version restriction for CI

* Bump NF version in README

* Replace task.process.tokenize logic with task.process

* Minor tweaks to unify syntax in tests main.nf

* Add a separate nextflow.config for each module

* Transfer remaining module options to nextflow.config

* Remove addParams from tests main.nf

* Remove TODO statements

* Use -c to import module specific config

* Bump NF version to 21.10.3

* Fix tests for artic/minion

* Fix broken publishDir syntax

* Standardise and fix obvious failing module tests

* Remove kronatools to krona

* Comment out tags in subworkflow test.yml

* Fix failing module tests

* Add consistent indentation to nextflow.config

* Comment out subworklow definitions

* Fix kallistobustools/ref

* Fix rmarkdownnotebook

* Fix jupyternotebook

* Quote task.process

* Add plink2/vcf to pytest_modules.yml

* Remove NF_CORE_MODULES_TEST from pytest CI

* Fix more tests

* Move bacteroides_fragilis to prokaryotes folder

* Fix cooler merge tests

* Fix kallistobustools/count tests

* Fix kallistobustools/ref tests

* Update test_10x_1_fastq_gz file for kallistobustools/count tests

* Fix bcftools/query tests

* Fix delly/call tests

* Fix cooler/zoomify tests

* Fix csvtk/split tests

* Fix gatk4/intervallisttools tests

* Fix gatk4/variantfiltration

* Fix pydamage/filter tests

* Fix test data for unicycler

* Fix gstama/collapse module

* Fix leehom tests

* Fix metaphlan3 tests

* Fix pairtools/select tests

* Update nextflow.config

* Update nextflow.config

* feat: update syntax

* Fix arriba tests

* Fix more failing tests

* Update test syntax

* Remove comments from tests nextflow.config

* Apply suggestions from code review

* Fix kallistobustools/count module

* Update dumpsoftwareversions module

* Update custom/dumpsoftwareversions

* Add args2 to untar module

* Update leftover modules

* Remove last remaining addParams

Co-authored-by: JoseEspinosa <kadomu@gmail.com>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: MaxUlysse <max.u.garcia@gmail.com>
2021-11-26 07:58:40 +00:00
Annick Renevey
45985ff6f0
Peddy nf core2 2dev0 (#1048)
* Updated module to fit nf-core2.2dev0 templates

* Updated module to fit nf-core2.2dev0 templates

* Linked test files to nf-core/test-dataset branch:raredisease raw files

* Change order of input: vcf and tbi with meta, ped without

* Change order of input: vcf and tbi with meta, ped without/adapt test

* Change order of input: vcf and tbi with meta, ped without/adapt test, bugfix

* Indent and rename files

* Update modules/peddy/main.nf

Removed newline

Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>

* Update modules/peddy/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/meta.yml

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/meta.yml

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/peddy/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update pytest_modules.yml

* Update main.nf

* Apply suggestions from code review

Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-21 20:14:09 +00:00
Florian De Temmerman
1455498152
CNVkit: Make targets file optional when running in WGS mode (#1030)
* Make targets.bed optional when running in wgs mode

* added test for cram

* Update test_data_config with new reference.cnn

* Update main.nf to allow tumor-only running

Still need a unit-test for this. Almost ready, but needs this file as input https://github.com/nf-core/test-datasets/blob/modules/data/generic/cnn/reference.cnn

* re-writing previous changes, but now it wont crash the entire CI-setup

* fixing overlooked merge conflict

* last overlooked merge-conflict

* move all files to batch subfolder

* adding an optional input for a reference file (needed when running germline and tumoronly)

* minor typo

* update meta.yml

* aligning code, renaming cnvkit to cnvkit_batch, renaming tumorbam to tumor, normalbam to normal

* Update pytest_modules.yml

Co-authored-by: EC2 Default User <ec2-user@ip-172-31-21-198.us-west-2.compute.internal>
Co-authored-by: Lasse Folkersen <lassefolkersen@gmail.com>
Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-21 19:56:57 +00:00
Abhinav Sharma
15fd90ffe8
Add phyloflash module (#786)
* initial stubs [ci skip]

* remove comments and add main command [ci skip]

* design iteration [ci skip]

* add new standard functions.nf [ci skip]

* update the version string [ci skip]

* accomodate the db stubs and single/double ends [ci skip]

* add FIXME for missing info [ci skip]

* Accomodate the results folder [ci skip]

* Update main.nf

* Apply suggestions from code review

* Update main.nf

* Apply suggestions from code review

* Add version file to stubs [ci skip]

* Tweak the output dir pattern [ci skip]

* Update modules/phyloflash/main.nf

* Update modules/phyloflash/main.nf

* Update modules/phyloflash/main.nf

Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2021-11-21 19:43:58 +00:00
Sébastien Guizard
c25c3fe466
Update: uLTRA (#1081)
* 👌 IMPROVE: Update .gitignore

* 📦 Add ultra module

* 👌 IMPROVE: Update test input

* 👌 IMPROVE: Update and clean code

- Update to last versions.yml file
- Update meta.yml
- Correct typos

* 👌 IMPROVE: Update output channels + Rename following subtool

* 👌 IMPROVE: Remove old ultre files

* 👌 IMPROVE: Update of pytest_modules.yml

* 👌 IMPROVE: Update test.yml

* 👌 IMPROVE: Keep md5sum as much as possible

* 👌 IMPROVE: Remove old ultra files

* 👌 IMPROVE: Update of pytest_modules.yml

* 👌 IMPROVE: Update test.yml

* 👌 IMPROVE: Keep md5sum as much as possible

* 🐛 Fix: add unsaved modifications

* 🐛 FIX: Remove one inconstant md5sum

* 🐛 FIX: Grab software name using ${getSoftwareName(task.process)}

* 🐛 FIX: Remove md5sums for pickle files (not constant).

* Update modules/ultra/pipeline/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/ultra/pipeline/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* 👌 IMPROVE: update output directory, update meta.yml

* 👌 IMPROVE: Use modules to gunzip and sort gtf

* 🐛 FIX: Set up channel correctly

* 👌 IMPROVE: Remove pickles files and databases

Those data might be useful in a debugging purpose.

* Apply suggestions from code review

* Update main.nf

* 🐛 FIX: Update uLTRA to version 0.0.4.1 + remove $(pwd)

* 👌 IMPROVE: Sort tags in test.yml

* align order of input between main.nf and meta.yml. Add ksahlin as co-author (he did update his package to overcome the pwd-problem

* Update main.nf

* Update main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
Co-authored-by: Lasse Folkersen <lassefolkersen@gmail.com>
Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
2021-11-21 13:00:53 +00:00
James A. Fellows Yates
d30bf235b1
update: gunzip to include meta input tuple (#1082)
* Specify more guidelines on input channels

* Linting

* Updates based on code review

* Update README.md

* Fix broken sentence

* feat: add megahit module, currently decompressed output

* Update main.nf

* Update tests/modules/megahit/test.yml

Co-authored-by: Maxime Borry <maxibor@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* feat: compress all outputs, remove md5sums due to gz stochasicity

* fix: wrong conda channel for pigz

* fix: broken singleend tests and update meta.yml

* Missed one

* Apply suggestions from code review

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* fix: pigz formatting

* Apply suggestions from code review

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Apply suggestions from code review

* Add bamUtil trimBam

* Update modules/bamutil/trimbam/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

* Update modules/bamutil/trimbam/main.nf

* Changes after code-review

* YAML lint

* update: add (optional) meta to input tuple

* YAML linting

* Update main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
Co-authored-by: Maxime Borry <maxibor@users.noreply.github.com>
Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>
Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
2021-11-21 12:41:03 +00:00
Robert A. Petit III
29c669766d
add bakta module (#1085)
* add bakta module

* Update main.nf

* Update main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-21 12:17:25 +00:00
Robert A. Petit III
5ebe62612c
add ectyper module (#948)
* add ectyper module

* fix-lint

* try zcat

* Update main.nf

* fix lint

* Update main.nf

* Apply suggestions from code review

Co-authored-by: Francesco L <53608000+lescai@users.noreply.github.com>

* Update main.nf

* pass lint

* Update main.nf

* fix lint

Co-authored-by: Francesco L <53608000+lescai@users.noreply.github.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-21 12:14:02 +00:00
Maxime Borry
72c94dbed9
Add new module: Das Tool (#1004)
* add pydamage module

* remove TODOs

* split module by subcommands

* update version parsing

* remove forgotten TODOs

* update module names

* remove old holistic module

* Update modules/pydamage/analyze/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* add keywords

* update resource requirement

* Update modules/pydamage/filter/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/pydamage/filter/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* merge from upstream

* update pydamage from upstream

* add freebayes

* update pydamage test from upstream

* fix meta.yml

* update functions.nf

* update test.yml

* update version parsing

* update version parsing

* fix indentation

* Update modules/freebayes/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/freebayes/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/freebayes/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* add optional inputs

* Update modules/freebayes/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* add bed test

* add metabat2 module

* only freebayes

* remove metabat2

* update md5sum because of vcf including date of the day

* add keyword

* rescue conflicted files

* attempt to fix ECLint

* add pytest workflow for metabat

* remove -

* Update modules/metabat2/jgisummarizebamcontigdepths/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/metabat2/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/metabat2/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/jgisummarizebamcontigdepths/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* add optional inputs/outpus

* remove trailing whitespace

* compressing and removing not reproducible md5sums

* follow symlinks while decompressing

* add dastool/scaffolds2bin

* add dastool

* remove non reproducible md5sum check for compressed files

* Update tests/modules/metabat2/metabat2/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update tests/modules/metabat2/metabat2/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* split tests

* export env variable

* remove metabat2 from PR

* fix linting errors

* remove traling whitespace

* Update modules/metabat2/jgisummarizebamcontigdepths/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/jgisummarizebamcontigdepths/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/metabat2/main.nf

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* Update modules/metabat2/metabat2/meta.yml

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>

* answer PR comments and switch to bgzip

* PR review updates

* update from PR review

* update test files

* add bacillus fragilis alignments

* switch tests to bacillus fragilis

* add string check

* update test string

* add pr comment answer

* last fixes for PR review

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
2021-11-19 08:33:29 +01:00
FriederikeHanssen
19035c99d1
Add thread option to samtools modules (#1069)
* add thread option to samtools modules

* fix tests

* fix tests

* fix tests

* Fix naming to fix tests

* cpus-1 to account for mainthread

* remove thread in ampliconclip, docu doesn't report this param

* add -1 to all other applicable samtools modules

* Update samtools version

* Update checksums

* retrigger GHA after update

* Update modules/samtools/fastq/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/fixmate/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/flagstat/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/index/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/merge/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/stats/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Update modules/samtools/view/main.nf

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>

* Fix md5sum fixmate

* Fix md5sums

* sth funny with the fixmate checksums

* more md5sums updates

Co-authored-by: Patrick Hüther <patrick.huether@gmail.com>
2021-11-18 22:24:47 +01:00
Jose Espinosa-Carrasco
4e5b6ed843
Fix picard markduplicates (#1084)
* Fix picard/markduplicates with new options syntax

* Delete md5sum for bam files and add contains for metrics.txt

Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2021-11-18 21:54:14 +01:00
praveenraj2018
43a1c1c6d1
Update in GATK4 variantfiltration: Added vcf_index to vcf tuple; output to vcf.gz format. (#1083)
* Added vcf_index to vcf tuple; output to vcf.gz format.

* Fix: extra new line in meta.yml.

* addressed review feedback

* fix: editorconfig error

* fix: gatk memory flag

* fix: editorconfig error

* fix: Indentation 

fix: Indentation

* Fix: lint editorconfig error

Removed one extra space

Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
2021-11-18 21:47:40 +01:00
Robert A. Petit III
f052dc445c
use underscores in anchors and references (#1080)
* use underscores in anchors and references

* Dummy change to trigger CI

* use dev branch

* underscore anchor
2021-11-18 18:09:09 +00:00
GCJMackenzie
5b975cc20d
Add gatk somatic paired calling subworkflow (#1067)
* initial commit to setup branch

* workflow finished

* Update nextflow.config

* tumour to tumor, getpileup passed as nomral and tumor

* paired_somatic renamed to tumor_normal_somatic

* Apply suggestions from code review

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* Update subworkflows/nf-core/gatk_tumor_normal_somatic_variant_calling/main.nf

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* updated index names in meta.yml

* changed index file names in main script and test

* Apply suggestions from code review

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>

* Apply suggestions from code review

* fixed bug from changes

* Apply suggestions from code review

* tests should now work after the yml update

* Update pytest_modules.yml

Co-authored-by: GCJMackenzie <gavin.mackenzie@nibsc.org>
Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
Co-authored-by: Maxime U. Garcia <max.u.garcia@gmail.com>
2021-11-17 11:34:07 +01:00
GCJMackenzie
071b1d50a8
Add gatk somatic tumour calling subworkflow (#1064)
* initial commit to set up new branch

* save changes to checkout

* workflow working, still needs test.yml and meta.yml, also fix versions file

* subworkflow finished

* Update pytest_subworkflows.yml

* Update pytest_subworkflows.yml

* Update pytest_subworkflows.yml

* fix config subworkflow name

* Update main.nf

* Update pytest_subworkflows.yml

* fixed md5sum issue likely caused by gatk version update

* tumour changed to tumor

* old dir deleted

* Comments added to explain use of placeholders '[]'

* updated index names, input channel renamed to input

* Apply suggestions from code review

* updated to perform new subworkflow testing

Co-authored-by: GCJMackenzie <gavin.mackenzie@nibsc.org>
Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
2021-11-17 11:07:17 +01:00
Edmund Miller
2d4549122b
feat: Add main.nf (#1077)
Allows for launching of subworkflows
2021-11-16 14:49:57 +00:00
praveenraj2018
691feeafdc
GATK4 SplitNCigarReads: fasta_fai_dict tuple is now split into separate input channels (#1076)
* fasta_fai_dict tuple is now split into separate input channels

* fix: lint errors

* fix: pytest errors

* Update modules/gatk4/splitncigarreads/meta.yml

* Update modules/gatk4/splitncigarreads/main.nf

Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
2021-11-16 15:09:30 +01:00
Michael L Heuer
b50f4e3d59
Update dsh-bio to 2.0.6. (#1075)
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-16 11:37:27 +00:00
Robert A. Petit III
bc8899f1bf
[fix] hicap module allow optional outputs (#937)
* make hicap outputs optional

* update test data

* typo

* Update main.nf

* use mkfifo

* Update main.nf

Co-authored-by: Gisela Gabernet <gisela.gabernet@gmail.com>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-16 09:23:07 +00:00
Sateesh
d5f6985607
add new nucmer module (#945)
* add new nucmer module

* Apply suggestions from code review

Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>

* update tests with file produced by input

* Update main.nf

* Update meta.yml

Co-authored-by: Michael Cipriano <mcipriano@gmail.com>
Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 22:05:34 +00:00
JIANHONG OU
52c541b080
Cooler cload (#634)
* rebuild cooler cload.

* update test file path of cload.

* add pytest for cload

* update to version.yml

* update the test data path

* Update tests/modules/cooler/cload/main.nf

Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>

* Update modules/cooler/cload/main.nf

Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>

* Update tests/config/test_data.config

Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>

* Update main.nf

Remove a lonely curly bracket.

* Update test.yml

Updated with new workflows.

* update the test files

* merge the conflicts.

* update the test.yml

* update for change of cooler/dump

Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 21:43:55 +00:00
Robert A. Petit III
c2bba7a65d
add clonalframeml module (#974)
* add clonalframeml module

* Update main.nf

* try recommended gzip

* Update main.nf

Co-authored-by: Chris Cheshire <chris.j.cheshire@gmail.com>
2021-11-15 19:43:53 +00:00
tamara-hodgetts
13b8a16f4a
Add module get_chrom_sizes (#1063)
* hifiasm copied from fastqc

* hifiasm tests init from fastqc

* meta.yml init; test.yml and main.nf for printing version

* Add hifiasm version printing

* Removed spaced on an empty line

* Reverted hifiasm from main

* init getchromsizes

* add tests for getchromsizes

* Included meta.yml

* removed whitespace

* Moved getchromsizes to custom folder

* Update modules/custom/getchromsizes/main.nf

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>

Co-authored-by: Sviatoslav Sidorov <sviatoslav.sidorov@crick.ac.uk>
Co-authored-by: Svyatoslav Sidorov <svet.sidorov@gmail.com>
Co-authored-by: Chris Cheshire <chris.j.cheshire@gmail.com>
Co-authored-by: Tamara Hodgetts <hodgett@crick.ac.uk>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 19:22:12 +00:00
Robert A. Petit III
2294ff7826
add ncbi-genome-download module (#980)
* add ncbi-genome-download module

* Update modules/ncbigenomedownload/main.nf

Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 18:32:53 +00:00
SusiJo
ad46010385
Added new module csvtk/split (#1014)
* added module csvtk/split

* removed todo statement

* adjusted meta map names

* changed tests to use generic input files

* added module in pytest

* updated test-data paths

* Apply suggestions from code review

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 18:29:55 +00:00
Edmund Miller
2af071ed0d
Fix subworkflows seperate from modules (#933)
* ci: Remove pytest_subworkflows

* ci(bam_sort_samtools): Depend on paths-filter instead of pytest-workflow

Co-authored-by: Harshil Patel <drpatelhh@gmail.com>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: Jose Espinosa-Carrasco <kadomu@gmail.com>

* ci: Revert back to one job branch

* ci(align_bowtie2): Run tests that depend on bam_sort_samtools

* ci: Fix anchor not being created yet

* ci: Update sra_fastq tags and pytest_modules

* fix(bam_sort_samtools): Update nextflow.config with params

* test(subworkflows): Update gatk_create_som_pon tags

* ci: Point to subworkflow_hacks branch of nf-core tools

Co-authored-by: Harshil Patel <drpatelhh@gmail.com>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: Jose Espinosa-Carrasco <kadomu@gmail.com>
2021-11-15 18:18:46 +00:00
avantonder
527ccdb419
Add Miniasm module (#962)
* add racon

* add miniasm module

* edit miniasm module

* edit miniasm module

* Update tests/modules/racon/main.nf

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* Update tests/modules/racon/test.yml

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* Update modules/miniasm/meta.yml

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* Update main.nf

Add some spaces.

* Update meta.yml

Correct DOI

* Update main.nf

* Apply suggestions from code review

* Update tests/modules/miniasm/test.yml

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>
Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 17:50:56 +00:00
mjakobs
466b964b37
add Kronatools KTImportTaxonomy (#928)
* created and initialised krona module

* Added kronatools/ktimporttaxonomy module

* removing previous redundant work

* added contains info for html

* edited contains in test.yml

* Update get versions

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* remove old syntax

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* rewording module description

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* added detailed keywords

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* update syntax and tool version

* fixed meta.yml issues

* remove contains line from test.yml

* re-wrote module after nf-core/tools update - should work now

* removed md5

* Update modules/kronatools/ktimporttaxonomy/main.nf

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>

* update meta save

* removed typo

* double quotes to single quotes around html

* re-ran test, which updated md5

* removed md5

* 'classifier' removed to fix linting

* update version

* removed erroneous ktimporttaxonomy2

* Updated input to include meta and database

* fixed tab issues in yaml

* added `contains` to test.yml

* edited `contains` in test.yml

* trying another `contains`

* retrying `contains`

* contains with extra line

* removed classifier from tag

* Apply suggestions from code review

* Update meta.yml

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>
Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 17:40:46 +00:00
avantonder
8d9e8ae839
Add Medaka module (#992)
* add racon

* add medaka module

* add medaka module

* add medaka module

* add medaka module

* add medaka module

* add medaka module

* Indentation

* Apply suggestions from code review

Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>

* Update main.nf

* Update main.nf

* Apply suggestions from code review

Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-11-15 17:26:37 +00:00
JIANHONG OU
4398056204
Macs2 calllpeak (#1038)
* Add tests and yml file for macs2/callpeak

* add format option for macs2

* update macs2/callpeak to accept format argument

* update test.yml

* update the container version.

* try to fix the issue in conda container.

* Update conda and containers

* Going back to previous container versions

Co-authored-by: JoseEspinosa <kadomu@gmail.com>
2021-11-15 18:17:40 +01:00
Maxime U. Garcia
3426834744
feat: fastaidx -> fai (#1073) 2021-11-15 18:03:02 +01:00