Commit graph

826 commits

Author SHA1 Message Date
Veit Schwämmle
2e13607a6a
Merge branch 'nf-core:master' into maxquant 2022-01-19 15:19:57 +01:00
Harshil Patel
bb90e4fb78
Remove bcftools and ivar module customisations (#1217)
* Remove customisation from bcftools modules

* Add save_mpileup option to bcftools/mpileup

* Remove params.save_mpileup from ivar/consensus

* Update meta.ymls
2022-01-18 16:04:56 +00:00
Jose Espinosa-Carrasco
4e9cc84514
Bump chromap index version (#1216)
* Bump chromap version

* Update md5 hash

* Remove md5 check, variable with conda
2022-01-18 12:24:21 +01:00
FriederikeHanssen
1287ba48fe
Update version & add intervals usage (#1214)
* Update version & add intervals usage

* Fix config when passing intervals as file

* Use proper paths
2022-01-17 16:40:31 +01:00
Harshil Patel
796dbb573e
Add nextclade/datasetget and nextclade/run modules (#1210)
* Remove old nextclade module

* Add nextclade/datasetget and nextclade/run modules

* Fix ECLint

* Add reference and tag as inputs to datasetget module

* Fix tests

* Adjust spacing
2022-01-17 11:46:15 +01:00
Abhinav Sharma
6243c3792c
module: deepvariant (#572)
* Add stubs for deepvariant [ci skip]

* Update the stubs for deepvariant [ci skip]

* functional with google docker image

* cleanup

* consume docker container within singularity executor

* update the meta.yml file and ask for review

* tweak the input channel shape and test data

* tweak input data [ci skip]

* update for the new syntax

* remove the functions and rename meta vars

* Update the arguments mechanism

* update chr, region and checksum

Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
Co-authored-by: Maxime U. Garcia <max.u.garcia@gmail.com>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2022-01-17 12:25:36 +02:00
Michael L Heuer
c9587d76e2
Update dsh-bio to version 2.0.7, add support for compressed GFA 1.0 format (#1207)
* Update dsh-bio to version 2.0.7, add support for compressed GFA 1.0 format

* fix ci failures

Co-authored-by: Chris Cheshire <chris.j.cheshire@gmail.com>
2022-01-17 09:24:40 +00:00
Harshil Patel
280712419d
Add new vcflib/vcfuniq module (#1208)
* Add new vcflib/vcfuniq module

* Rename module from vcfutils to vcfuniq

* Fix tests

* Compress output by default

* Fix ECLint
2022-01-14 18:18:11 +00:00
Simon Heumos
4cc3921efb
Add pangenome test data set keys (#1170)
* Update seqwish to version 0.7.2

* seqwish can work with a comma-separated list of PAFs

* level with nf-core/modules master branch

* add pangenome test data keys

* the odgi test data lives in its own folder

Co-authored-by: Michael L Heuer <heuermh@acm.org>
Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
2022-01-12 12:01:57 -06:00
Harshil Patel
b4c6b430d0
Remove params call in ivar variants module (#1203)
* Remove params call in ivar variants module

* Update main.nf
2022-01-12 16:43:26 +00:00
veitveit
ab9b204b47 all files remote now 2022-01-12 16:44:48 +01:00
veitveit
af8e69c53a all files remote now 2022-01-12 16:44:28 +01:00
FriederikeHanssen
598d7abdb2
Log4j again (#1202)
* Log4j again

* Update checksums
2022-01-12 13:55:54 +01:00
Mei Wu
30e64becaa
ucsc/wigtobigwig: add meta map (#1199)
* add meta info

* updated meta.yml

* Apply suggestions from code review

* Update test.yml

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2022-01-11 21:31:37 +00:00
Harshil Patel
e751e5040a
Bump software versions for viralrecon modules (#1198)
* Bump software versions for viralrecon modules

* Remove custom params.save_unaligned from bowtie2_align

* Unify samtools modules and error if input and output names are the same

* Fix ALL the tests
2022-01-07 17:52:39 +00:00
emnilsson
c4549c0ecd
Editing the CAT/CAT module to handle single files (#1196)
* Removed if-statement to only run on more than 1 file, now it will run on single files as well.

* Added a test for running the cat_cat module on a single file.

* Created a new test.yml with nf-core modules create-test-yml -t cat/cat

* Edited test.yml to not include paths and md5sums for versions.yml, and also removed sometimes variable md5sums
2022-01-06 16:41:36 +00:00
Gwenna Breton
2d4b0f7787
Bcftools sort new syntax (#1169)
* Added files for bcftools/sort

* Fixed output format and removed md5 checksum

* Change input to avoid identical in/output names

* Created rows for bcftools/sort in pytest_modules.yml
2022-01-05 12:15:54 +01:00
Robert A. Petit III
bf5edb8614
add module for mash dist (#1193)
* add module for mash dist

* fix lint

Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
2022-01-04 17:29:49 +01:00
Harshil Patel
e3285528ac
Fix modules warned or failed with nf-core modules lint (#1191) 2022-01-03 18:00:46 +00:00
veitveit
adc0f71904 added pytest 2022-01-03 11:33:17 +01:00
Gregor Sturm
240d08b32a
Merge branch 'master' into maxquant 2022-01-02 22:36:05 +01:00
FriederikeHanssen
a6e0629e24
Change intervals to be part of sample specific input (#1189)
* Change intervals to be part of sample specific input

* Fix some tests

* Update checksum

* Update intervals

* Update intervals

* Try out gavins idea for adding the file

* update test line

* update test line

* update test line

* revert contains line
2021-12-23 12:58:20 +01:00
Robert A. Petit III
5320ab7e6c
Fix kleborate inputs (#1172)
* Fix kleborate inputs

* Update test.yml

Co-authored-by: Sébastien Guizard <sguizard@ed.ac.uk>
2021-12-22 11:39:35 +00:00
Veit Schwämmle
47f2da30dc
Merge branch 'master' into maxquant 2021-12-21 12:53:37 +01:00
FriederikeHanssen
50eafb19c6
Update version for log4j vulnerability (#1176)
* Update version for log4j vulnerability

* update checksums

* update checksums

* update checksums

* Remove todo string

* remove werid output paths

* remove werid output paths

* remove werid output paths

* Update various checksums

* Update various checksums

* Remove unstable md5sums

* Update md5sums

* Fix pileupsummary

* Fix genotypegvcfs

* Update test files mutect2

* hm genotypevcf updated again

* Update some mutect checksums and whatnot

* Fix last mutect checksum

* Apply suggestion to use mtochondria data instead
2021-12-20 17:10:49 +01:00
veitveit
14b661d3eb test 2021-12-20 09:53:47 +01:00
veitveit
cde5f4215c . 2021-12-20 09:49:57 +01:00
veitveit
1cdb4a2927 corrected memory 2021-12-20 09:43:07 +01:00
veitveit
d16cfb0dfa first upload 2021-12-20 08:36:32 +01:00
Simon Pearce
02218ab5a0
hmmcopy/mapCounter (#1175)
* hmmcopy/mapCounter

* update test

* Remove bam tag

* Remove /tmp/ path from test.yml

* Update modules/hmmcopy/mapcounter/meta.yml

Incorporate formatting changes

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

* Update modules/hmmcopy/mapcounter/meta.yml

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

* Update tests/modules/hmmcopy/mapcounter/main.nf

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

Co-authored-by: Simon Pearce <simon.pearce@cruk.manchester.ac.uk>
Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
2021-12-17 15:39:50 +00:00
veitveit
c3f8aca21b first working version of maxquant 2021-12-17 12:34:28 +01:00
Harshil Patel
ce8c781bb4
Provide BAI when running rseqc/tin (#1177)
* Provide BAI when running rseqc/tin

* Add md5sum

* Add proper md5sums

* md5sum not md5

* Add xls to meta.yml
2021-12-17 10:00:09 +00:00
SusiJo
3eff67f54d
Added new module snpsift/split (#1031)
* added new module snpsift/split

* added options.args

* added .vcf.gz to input

* removed test and updated to new NF DSL2 syntax

* Updated to new NF DSL2 syntax

* added option to join vcf files

Co-authored-by: Robert A. Petit III <robbie.petit@gmail.com>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2021-12-17 09:08:14 +01:00
GCJMackenzie
54e0ac4ed9
add module: Variantrecalibrator (#1088)
* committing to pull updated nf-core files

* saving changes to checout other branch

* committing progress so far, difficulty with test data

* uploading to be used as draft PR

* fix linting error in meta.yml

* attempt to group reference inputs together

* updated input format for resources

* meta.yml updated with new resource names

* added output channel for recal index

* module only takes single vcf file input now

* committing to checkout

* update to new syntax, remove indel test for now

* updated to use memory options and new test data

* Update modules/gatk4/variantrecalibrator/main.nf

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

* Update main.nf

* Update modules/gatk4/variantrecalibrator/main.nf

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

* remove duplicate test keys from test_data.config

Co-authored-by: GCJMackenzie <gavin.mackenzie@nibsc.org>
Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
2021-12-16 10:54:49 +00:00
GCJMackenzie
9f8d9fb615
Add applyvqsr (#1101)
* 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

* modified yml to allow new subworkflow testing

* Update test.yml

* Update test.yml

* add applyvqsr

* added memory options, new test data used

* Update main.nf

* Update main.nf

Co-authored-by: GCJMackenzie <gavin.mackenzie@nibsc.org>
Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
2021-12-16 08:44:50 +00:00
Harshil Patel
67571c4e79
Add RSeqC tin.py module (#1174)
* Add RSeqC tin.py module

* Fix EC lint for unrelated hmmcopy module

* Remove md5sum for empty file
2021-12-15 21:26:43 +00:00
Simon Pearce
ae92159762
New subtool: hmmcopy/generatemap (#1168)
* Initial structure

* Working with local singularity image

* Working generateMap.pl script

* Remote not working bioconda

* Working generateMap with biocontainer

* Lint changes

* Updated hmmcopy container version to be consistent

* Fix failing test

* Remove path to perl

* No hardpath to script

* Update main.nf

Moved version outside of process, add support for zipped fasta file

* Revert to not allowing gzip via pipe, as perl script can't cope

Co-authored-by: Simon Pearce <simon.pearce@cruk.manchester.ac.uk>
2021-12-15 16:57:42 +01:00
GCJMackenzie
61376425fb
BugFix: add missing tbi output channel to genotypeGVCFs (#1153)
* 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

* modified yml to allow new subworkflow testing

* Update test.yml

* Update test.yml

* added output channel for tbi files, tweaked method of adding blank inputs for gendb tests

* Update main.nf

* Update main.nf

Co-authored-by: GCJMackenzie <gavin.mackenzie@nibsc.org>
Co-authored-by: Maxime U. Garcia <maxime.garcia@scilifelab.se>
2021-12-14 16:10:08 +00:00
Mingda Jin
826a5603db
Stage fastq for concat in subfolders to avoid name collision issue (#1107)
* Stage fastq for concat in subfolders in task workdir

* Update main.nf

* Update test.yml

Co-authored-by: Harshil Patel <drpatelh@users.noreply.github.com>
2021-12-13 19:18:27 +00:00
Harshil Patel
0fafaeebf5
Revert PR #1147 (#1166)
* Revert PR #1147

* Fix md5sum for crai file
2021-12-13 16:15:20 +00:00
James A. Fellows Yates
be85289981
Update metabat2 output channels and compression (#1111)
* feat: each output type has dedicated channel replace bgzip with gzip can only zip one at a time

* Add condition moving of unbinned files

* fix: solution for moving sometimes non-existant files

* fix: update meta.yml to add the new channels

* fix: remove most of the checksums due to variability

* fix: tweaking of output

* Update modules/metabat2/metabat2/main.nf

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

* Fix find commands

* Fix find commands

Co-authored-by: Maxime Borry <maxibor@users.noreply.github.com>
2021-12-09 15:00:32 +01:00
Anan Ibrahim
1f3f2b18bb
Add new module macrel/contigs (#1109)
* Add new module macrel/contigs

* removed trailing whitespace

* removed whitespace

* linting cleanup

* Apply suggestions from code review

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

* Updated the test.yml

It didnt upload the updated version earlier for some reason :(

* Update test.yml

* Update test.yml

* Update test.yml as generated by pytest

* Update test.yml

* updated the version issue

* Update tests/modules/macrel/contigs/test.yml

* Update modules/macrel/contigs/main.nf

* Update modules/macrel/contigs/main.nf

* Update pytest_modules.yml

* Update pytest_modules.yml

* Update modules/macrel/contigs/main.nf

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

* Zipped all fasta outputs

* Update main.nf

* Update test.yml

* Update test.yml

* Update main.nf

* Update main.nf (gzip -n)

* Update test.yml

* Update main.nf

* Update main.nf

* Update test.yml

* Update tests/modules/macrel/contigs/test.yml

* Update modules/macrel/contigs/main.nf

* Apply suggestions from code review

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

Co-authored-by: darcy220606 <ananhamido@hotmail.com>
Co-authored-by: James A. Fellows Yates <jfy133@gmail.com>
2021-12-09 13:17:50 +01:00
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
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
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
FriederikeHanssen
7006699ff8
Update version & prefix (#1120)
* Update version & prefix

* Fix indentation
2021-12-07 10:22:32 +01:00