Commit graph

19 commits

Author SHA1 Message Date
James A. Fellows Yates
90aef30f43
Set process label to process_single for modules with no task.cpus usage (#2076)
* Set process label to `process_single` for modules with no `task.cpus` usage

* Fix tests of 'borked' modules

* prettier

* More modules are single-threaded and can use process_single

* Adding process_single to hmmer/esl* modules

* Fix failing tests

* Prettier

Co-authored-by: Matthieu Muffato <mm49@sanger.ac.uk>
Co-authored-by: Daniel Lundin <erik.rikard.daniel@gmail.com>
2022-09-19 11:54:47 +02:00
Daniel Lundin
b6f18f8733
eslreformat: descriptive suffix (#2081) 2022-09-19 09:49:00 +02:00
Daniel Lundin
847bebc0ab
Make hmmer/hmmalign output files with correct prefix (#2067) 2022-09-15 14:06:18 +02:00
Daniel Lundin
885e724e07
Add postprocessing option to hmmer/eslreformat (#2061)
* Add postprocessing option to hmmer/eslreformat

* Update tests/modules/hmmer/eslreformat/nextflow.config

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

* Update modules/hmmer/eslreformat/main.nf

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

Co-authored-by: Daniel Straub <42973691+d4straub@users.noreply.github.com>
2022-09-14 18:43:50 +02:00
Daniel Lundin
8bc5236371
Add hmmer/eslreformat (#2009)
* Created hmmer/eslalimask from template

* esl-alimask module with --rf-is-mask test case

* Add optional file output

* Add hmmer to test name

* Move from process_single to process_low

* Test for versions.yml, plus content

* Prettier

* Avoid gzipping input alignment

* hmmer/eslreformat from template

* Started on main.nf

* meta.id to prefix

* Continued work

* Fix version string so it's from *this* tool

* hmmer/eslreformat

* Prettier

* Get tests/config/pytest_modules.yml back

* Delete extra hmmer/eslalimask in pytest_modules.yml

* More prettier

* Fix path to versions.yml in test

* Remove 'format' param

* Fix problems with format param deletion

* Document format param
2022-09-05 15:21:09 +02:00
Daniel Lundin
b5e3d16d80
Added hmmer/eslalimask (#1999)
* Created hmmer/eslalimask from template

* esl-alimask module with --rf-is-mask test case

* Add optional file output

* Add hmmer to test name

* Move from process_single to process_low

* Test for versions.yml, plus content

* Prettier

* Avoid gzipping input alignment

* meta.id to prefix

* Fix version string so it's from *this* tool
2022-09-05 14:01:33 +02:00
Daniel Lundin
98642619bd
Add hmmbuild (#1960)
* Fixing test.yml

* hmmbuild passing tests

* Output meta

* Linting problem

* Linting problem again

* Fix prettier

* Update modules/hmmer/hmmbuild/meta.yml

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

* Fix missing prefix

* Accept mxfile param

* Output gzipped hmm

* Moved input file for test to modules branch

* Update modules/hmmer/hmmbuild/meta.yml

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

* Describe mxfile

* Get LENG  80 check back

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
2022-08-25 09:39:40 +02:00
Edmund Miller
f080015754
Prettier (#1405)
* style: Add prettier config files

* build: Add prettier vscode extension

* ci: Replace markdownlint and yamllint with prettier

* style: Run prettier

* style: Use indent of 2 for markdown as well

https://github.com/nf-core/tools/pull/1470#issuecomment-1071028358

* style: Fix indent

* style: Let editorconfig take over tab widths

* style: yaml => yml

* ci: Run prettier once

Co-authored-by: Phil Ewels <phil.ewels@scilifelab.se>

Co-authored-by: Phil Ewels <phil.ewels@scilifelab.se>
2022-03-18 14:27:50 +01:00
Moritz E. Beber
938387d10d
feat: add hmmsearch module and tests (#1273)
* feat: add hmmsearch module and tests

* chore: set medium resource requirements

* tests: look for correct output

* fix: add when condition

* Apply suggestions to meta.yml

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

* refactor: create gzip compressed output

* docs: describe compressed in-/output

Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
2022-02-23 15:32:33 +01:00
James A. Fellows Yates
f9d25aad7f
Switch to native mandatory gzipped reading for hmmalign (#1343)
* fix: remove left-over unnecessary code

* Update main.nf

* Update hmmer/hmmalign command to natively accept gzipped input

* Making @drpatelh happy

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>
2022-02-23 09:59:24 +00: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
Kevin
3aacd46da2
Backfill software licenses meta (#876)
* backfilled modules with meta.yml that had no license identifier

* harmonized BSD license names

* whitespace linting at modules/unzip/meta.yml:12

* harmonized software from US NIH-NCBI/NIST to 'US-Government-Work'

* Update modules/bcftools/index/meta.yml

`bcftools` is dual-licensed, use associative array to allow for multiple licenses

Co-authored-by: Michael L Heuer <heuermh@acm.org>

Co-authored-by: Michael L Heuer <heuermh@acm.org>
2021-10-22 15:39:54 -07:00
Harshil Patel
49da864287
Update versions key in meta.yml for all modules (#787) 2021-10-03 08:20:26 +01: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