Commit graph

9 commits

Author SHA1 Message Date
James A. Fellows Yates
625098a408
Adapterremoval glob fix (#1391)
* fix: remove left-over unnecessary code

* Partial fix for AR module output declarations

* Remove `def` for prefix so useable in output block

* Fix tests

* Add adapterlist support

* Fix tests after addition of adapter list
2022-03-14 07:32:21 +01:00
James A. Fellows Yates
0816df1e8b
Fix: removes hardcoded flags and 'custom' file output for AdapterRemoval (#1357)
* fix: remove left-over unnecessary code

* Removes hardcoded flags and more explicit output

* Fix test md5
2022-03-03 10:01:39 +01: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
24707f2144
Fix read indexing in AdapterRemoval module (#1051)
* 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

* 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

* 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

* fix read index

* update test.yml

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-10 12:21:12 +00:00
Harshil Patel
7b3315591a
Remove def software lines and emit versions channel as plural (#780)
* Remove def software line

* Replace version with versions in emit statement

* Fix default software names
2021-10-01 14:04:56 +01:00
Gregor Sturm
906577873b
Bulk update modules to use versions.yml (#739)
* New functions.nf

* Convert code to create versions.yml

* Update meta.yml

* update output channel

* Fix more meta.yml

* Manually update remaining modules

* remove superflous echo

* Fix misformatted meta.yml files

* Fix yaml, was list instead of dict

* fix version for bcftools

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-09-27 09:41:24 +01:00
Harshil Patel
e937c7950a
Rename software/ directory to modules/ to re-organise module structure (#567)
* Update README

* Rename pytest_software.yml to pytest_modules.yml

* Rename main software directory to modules

* Remove deprecated modules

* Rename tests software to modules

* Replace paths for tests in pytest_modules.yml

* Replace software with modules in Github Actions

* Replace software with modules in main.nf tests

* Rename software to modules in test.yml
2021-07-07 10:10:18 +01:00
Renamed from software/adapterremoval/main.nf (Browse further)