Commit graph

7 commits

Author SHA1 Message Date
James A. Fellows Yates
ae48653bd2
DASTool output channels update (#1489)
* fix: remove left-over unnecessary code

* Make summary output optional as not generated if no sufficiently HQ bins found

* Make contig2bin optional as only generated if sufficient HQ bins found
2022-04-04 13:31:36 +02:00
James A. Fellows Yates
8ce6810787
Update DASTool to 1.1.4 (#1471)
* fix: remove left-over unnecessary code

* Update DASTool

* Fix tests

* Fix test.ymls

* Fix container build version

* Make tests less strict to account for variability

* Apply suggestions from code review

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

* Add missing description

Co-authored-by: Sateesh Peri <33637490+sateeshperi@users.noreply.github.com>
Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>
2022-04-01 11:33:07 +02:00
Matthias Hörtenhuber
e745e167c1
Fix formatting in yaml files, add yamllint config (#1279)
* fix yml formatting

* allow fastq.gz and fq.gz as file input, add meta.yml and test

* fix yaml files

* Revert "allow fastq.gz and fq.gz as file input, add meta.yml and test"

This reverts commit 34002d7a7a8c7f7bb4600c3377f35c87849f71a4.

* prettier magic!

* fix comments for yamllint

* remove node version number

* fix linting errors

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2022-02-15 11:15:27 +00:00
Mahesh Binzer-Panchal
e20e57f90b
Add when: block (#1261) 2022-02-04 09:53:32 +01: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
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
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