Commit graph

33 commits

Author SHA1 Message Date
SusiJo
8208140d21 missing meta.id changed 2022-05-24 14:59:52 +02:00
SusiJo
6b425735b9 Merge remote-tracking branch 'origin/master' into cnvkit/reference 2022-05-24 14:20:55 +02:00
SusiJo
749edce069 add prefix 2022-05-24 14:20:19 +02:00
Harshil Patel
29a4f112be
Update main.nf 2022-05-24 11:14:32 +01:00
SusiJo
5db94ea0ee changed tag of module 2022-05-24 10:17:41 +02:00
SusiJo
0f0d555f96
Merge branch 'master' into cnvkit_reference 2022-05-24 08:03:44 +02:00
SusiJo
0708f343de
Merge branch 'master' into cnvkit_bam 2022-05-24 07:49:51 +02:00
SusiJo
50128b0c86
Merge branch 'master' into cnvkit_reference 2022-05-24 07:49:44 +02:00
SusiJo
58c5ec2f4e
rm line
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-23 18:53:28 +02:00
SusiJo
86b5951c14
rm line
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-23 18:48:30 +02:00
SusiJo
24905e26e2
rm line
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-23 18:48:13 +02:00
SusiJo
ddb964a4bf
rm line
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-23 18:48:04 +02:00
SusiJo
bbee9e3c3b add new module cnvkit/reference 2022-05-23 18:35:50 +02:00
SusiJo
4f9d672e55 added new module cnvkit/antitarget 2022-05-23 16:52:06 +02:00
SusiJo
9096be5464 improve readability 2022-05-20 13:29:49 +02:00
SusiJo
bdf222649d remove unnecessary if statement 2022-05-20 13:25:57 +02:00
SusiJo
153c900d0e
refine comment
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-20 13:08:38 +02:00
SusiJo
2e5aa0dbb4
refine comment
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-20 13:08:26 +02:00
SusiJo
3b3921cfa3
refine comment
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-05-20 13:07:57 +02:00
SusiJo
f392c4bed5 removed params section & added description fasta 2022-05-20 13:05:43 +02:00
SusiJo
129270d7bc adjusted conda env & singularity container 2022-05-20 10:37:46 +02:00
SusiJo
5a1297cc7d added optional pdf/png outputs 2022-05-20 09:12:47 +02:00
SusiJo
064712c4ea added cram_bam conversion & tumor_only check 2022-05-20 09:11:45 +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
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
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
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
c5235a983d
nf-core modules bump-versions for all modules (#630)
* Add blacklist of modules that shouldn't be updated to .nf-core.yml

* nf-core modules bump-versions for all modules

* Remove TODO statements identified by linting

* Fix md5sums for failing tests

* Fix more tests
2021-07-28 09:10:44 +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