Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nf-core/mag 3.2.0 release PR #699

Open
wants to merge 126 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
7d3650e
Replace local spades modules with official nf-core version (missing f…
jfy133 Sep 9, 2024
391ebd4
Update CHANGELOG.md
jfy133 Sep 9, 2024
e6301c8
Fix output docs
jfy133 Sep 10, 2024
debd080
Make sure warnings log also gets a prefix
jfy133 Sep 10, 2024
89f98e2
Merge branch 'dev' into bump-metaspades
jfy133 Sep 10, 2024
4d19b8f
Fix a syntax error (Ben made me do it)
jfy133 Sep 12, 2024
08445cf
Added modules porechop/abi and chopper for QC of long reads
Sep 20, 2024
5aa3049
Move long read preprocessing into subworkflow, and swapping porechop …
Sep 20, 2024
451612a
Remove module import from main workflow, and add PORECHOP_ABI in conf…
Sep 20, 2024
5437376
Switch local MEGAHIT to official nf-core one
jfy133 Sep 20, 2024
12b13d3
Fix wrongly set branch
jfy133 Sep 20, 2024
830a66e
Merge branch 'dev' into bump-metaspades
jfy133 Sep 20, 2024
7d7ad71
Fix linting
jfy133 Sep 20, 2024
59ef702
Exchange local filtlong module to nf-core/filtlong
muabnezor Sep 24, 2024
cd5ce2f
Add filtlong and porechop logs to multiqc
muabnezor Sep 24, 2024
5820fb4
Added --longread_preprocessing_tools parameters, to let user specify …
muabnezor Sep 24, 2024
5335fc5
Merge branch 'dev' into move_lr_qc
muabnezor Sep 25, 2024
1496ce9
Update modules/nf-core/filtlong/main.nf
muabnezor Sep 25, 2024
c11601a
make subworkflow name more verbose
muabnezor Sep 30, 2024
31deb5c
make --longread_adaptertrimming_tool as enum porechop or porechop_abi
muabnezor Sep 30, 2024
b2da50b
Make prefix for porechop/porechop-abi more verbose
muabnezor Sep 30, 2024
8955e31
lint
muabnezor Sep 30, 2024
644e2b1
Change default search pattern for filtlong.log files for the filtlong…
muabnezor Oct 1, 2024
3e15502
Update CHANGELOG.md
muabnezor Oct 3, 2024
ec8538c
Update CHANGELOG.md
muabnezor Oct 3, 2024
c6fb9b3
Update nextflow_schema.json
muabnezor Oct 3, 2024
b24f52f
Update conf/modules.config
muabnezor Oct 3, 2024
fcf509c
Update conf/modules.config
muabnezor Oct 3, 2024
8f9cac6
Update conf/modules.config
muabnezor Oct 3, 2024
10ecdc5
Update nextflow_schema.json
muabnezor Oct 3, 2024
ea6f9a4
Update nextflow.config
muabnezor Oct 3, 2024
b43b9f6
Update subworkflows/local/longread_preprocessing.nf
muabnezor Oct 3, 2024
25981a1
Update subworkflows/local/longread_preprocessing.nf
muabnezor Oct 3, 2024
edf8dab
Update subworkflows/local/longread_preprocessing.nf
muabnezor Oct 3, 2024
0a06944
Merge branch 'dev' into move_lr_qc
muabnezor Oct 3, 2024
4c9c5df
Merge branch 'dev' into bump-metaspades
jfy133 Oct 3, 2024
669a854
Linting fix
muabnezor Oct 3, 2024
a1098f3
make porechop-abi default long read adapter trimming tool
muabnezor Oct 3, 2024
9d7ce62
Replace assembler single-use fix-cpu functions with single line defin…
jfy133 Oct 3, 2024
ce449f2
Ensure checkmax is still used
jfy133 Oct 3, 2024
efabee7
Specify also module changes
jfy133 Oct 3, 2024
17ba45c
Fix changelog
muabnezor Oct 4, 2024
f54c967
Fix porechop_abi pattern in modules.config
muabnezor Oct 4, 2024
110b5dd
Merge branch 'dev' into move_lr_qc
muabnezor Oct 4, 2024
3472c87
remove chopper citation for now
muabnezor Oct 4, 2024
d7e51ef
Lets see if SPAdes now works with fusion with the new container...
jfy133 Oct 4, 2024
4acee76
Post-release version bump
jfy133 Oct 4, 2024
ab5f482
retrigger checks
muabnezor Oct 4, 2024
23bf9df
Merge pull request #682 from nf-core/post-3.10-version-bump
jfy133 Oct 4, 2024
2cfd5e5
Merge branch 'dev' into move_lr_qc
muabnezor Oct 4, 2024
1d3eff9
Fix version number in manifest
jfy133 Oct 8, 2024
5548183
Template update for nf-core/tools version 3.0.0
nf-core-bot Oct 8, 2024
22d3247
Template update for nf-core/tools version 3.0.1
nf-core-bot Oct 9, 2024
7b31394
Apply suggestions from code review
jfy133 Oct 11, 2024
78edf25
Apply suggestions from code review
jfy133 Oct 11, 2024
3c3b46a
Add previouysly undocumented output files to docs
jfy133 Oct 11, 2024
7c7e954
[automated] Fix code linting
nf-core-bot Oct 11, 2024
db33efd
Merge pull request #674 from muabnezor/move_lr_qc
jfy133 Oct 11, 2024
d80274f
Template update for nf-core/tools version 3.0.2
nf-core-bot Oct 11, 2024
b4b81a1
output multiple depth files
d4straub Oct 11, 2024
a6a0732
accept multiple depth files
d4straub Oct 11, 2024
0184057
update CHANGELOG
d4straub Oct 11, 2024
a2ffbf0
nf-core modules patch
d4straub Oct 11, 2024
a17b1a4
nf-core modules patch now for modules.json
d4straub Oct 11, 2024
b0248ef
pull from upstream and merge conflicts
d4straub Oct 11, 2024
a29b48b
publish summary and abundance files in results
d4straub Oct 14, 2024
cde08a8
use sample names for MaxBin2 abund
d4straub Oct 14, 2024
e6875de
force install latest MaxBin2 module
d4straub Oct 14, 2024
f2859c7
Update CHANGELOG.md
jfy133 Oct 16, 2024
15bacf0
Merge branch 'dev' of github.com:nf-core/mag into nf-core-template-me…
jfy133 Oct 16, 2024
63fe6a2
Remove unused parameters
jfy133 Oct 16, 2024
2af46d8
Comment out unusued tempalte parmaeter (renaming), and remove a dupli…
jfy133 Oct 16, 2024
6102d0e
Fix yaml indentation
jfy133 Oct 16, 2024
d7d3af2
Remove nonexistant section
jfy133 Oct 16, 2024
ca211b3
Remove unused aprameter
jfy133 Oct 16, 2024
43b00a6
Remove reference to max_* params and fix input schema
jfy133 Oct 17, 2024
410c869
Remoce references to `check_max()`
jfy133 Oct 17, 2024
2bbed0a
REplace custom check_<assembly>_cpus functions
jfy133 Oct 17, 2024
17d87ff
Merge pull request #690 from d4straub/fix-maxbin2-multiabund
jfy133 Oct 18, 2024
2c40897
update prodigal to helpfully not compress symlinks by having more spe…
jfy133 Oct 21, 2024
4f94dae
Update CHANGELOG
jfy133 Oct 21, 2024
32036a8
Merge branch 'dev' into fix-prodigal-pigz
jfy133 Oct 21, 2024
91fad57
[automated] Fix code linting
nf-core-bot Oct 21, 2024
7d66153
Merge pull request #698 from nf-core/fix-prodigal-pigz
jfy133 Oct 21, 2024
1f5b16c
Update schema, fix empty list in tag names, fix missing parameter def…
jfy133 Oct 21, 2024
bea3aa6
Fix gtdbtk default value incompatibility
jfy133 Oct 21, 2024
275579e
Fix check for group column in input
jfy133 Oct 21, 2024
5f2461b
Remove misleading error messages and allow more string types in run c…
jfy133 Oct 21, 2024
ae18c3c
Use correct input for assembly input and improve schema
jfy133 Oct 21, 2024
64009b4
Use more workable Zenodo link for CheckM database
jfy133 Oct 21, 2024
3f15a3e
Sync nextflow schema with nextflow.config
jfy133 Oct 21, 2024
3104f92
Update to Zenodo URL also in test config
jfy133 Oct 21, 2024
45d3d4b
Change pplacer paramter to integer and fix useram default to boolean …
jfy133 Oct 22, 2024
0ab0f58
Fix citations indentitation
jfy133 Oct 22, 2024
9a2e958
Fix GTDBTk Url in schema
jfy133 Oct 22, 2024
5c00892
Merge branch 'dev' into bump-metaspades
jfy133 Oct 22, 2024
a77b7c2
Update CHANGELOG
jfy133 Oct 22, 2024
31aceb5
Merge pull request #695 from nf-core/nf-core-template-merge-3.0.2-manual
jfy133 Oct 22, 2024
01065ae
Merge branch 'dev' into bump-metaspades
jfy133 Oct 22, 2024
717d433
Make sure meta mode is executed with the new module
jfy133 Oct 22, 2024
ebd18a1
Fix linting
jfy133 Oct 22, 2024
48cad97
Remove a TODO
jfy133 Oct 22, 2024
860926a
Add MEGAHIT prefix to ensure MEGAHIT at the beginning of the input fi…
jfy133 Oct 22, 2024
639addb
Re-add memory explicit parameter to MEGAHIT module (inbuilt into SPAd…
jfy133 Oct 22, 2024
ec318c7
Re-add MEGAHIT memory
jfy133 Oct 22, 2024
338a552
Use HTTPS URL for megahit container
jfy133 Oct 22, 2024
42d444f
Merge pull request #666 from nf-core/bump-metaspades
jfy133 Oct 22, 2024
ed711aa
Bump version
jfy133 Oct 22, 2024
daea789
Update workflow diagram
jfy133 Oct 22, 2024
6aa49c1
Merge pull request #700 from nf-core/bump-version
jfy133 Oct 22, 2024
dbc2ae9
Fix conda environment specification to match container of sub-depende…
jfy133 Oct 24, 2024
f1cbfc8
Add darkmode diagram
jfy133 Oct 24, 2024
d61def4
Typo fix for the light mode
jfy133 Oct 24, 2024
7a37fce
Soften white
jfy133 Oct 24, 2024
e1705e0
Merge pull request #703 from nf-core/darkmode-diagram
jfy133 Oct 24, 2024
c7f3071
Fix full test manual trigger following https://github.com/nf-core/met…
jfy133 Oct 24, 2024
babacaa
Merge pull request #704 from nf-core/jfy133-patch-1
jfy133 Oct 24, 2024
38d3f3c
Always run in --meta mode
jfy133 Oct 25, 2024
e974653
Update conf/modules.config
jfy133 Oct 25, 2024
723e621
Update conf/modules.config
jfy133 Oct 25, 2024
76e056a
Merge pull request #705 from nf-core/always-meta-parameter-metaspades
jfy133 Oct 25, 2024
78d9503
Harshil alignment
jfy133 Oct 25, 2024
1b08ecc
Update conf/test_full.config
jfy133 Oct 26, 2024
feeb14a
Update workflows/mag.nf
jfy133 Oct 26, 2024
2963ba0
Update .nf-core.yml
jfy133 Oct 26, 2024
4ec184d
Update CHANGELOG.md
jfy133 Oct 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Exchange local filtlong module to nf-core/filtlong
  • Loading branch information
muabnezor committed Sep 24, 2024
commit 59ef702dec27ec6dcbd9e34e59e13ed55fe2752b
8 changes: 7 additions & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,19 @@ process {
}

withName: FILTLONG {
ext.args = [
"--min_length ${params.longreads_min_length}",
"--keep_percent ${params.longreads_keep_percent}",
"--trim",
"--length_weight ${params.longreads_length_weight}"
].join(' ').trim()
publishDir = [
path: { "${params.outdir}/QC_longreads/Filtlong" },
mode: params.publish_dir_mode,
pattern: "*_lr_filtlong.fastq.gz",
enabled: params.save_filtlong_reads
]
ext.prefix = { "${meta.id}_run${meta.run}_lengthfiltered" }
ext.prefix = { "${meta.id}_run${meta.run}_lr_filtlong" }
}

withName: NANOLYSE {
Expand Down
5 changes: 5 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@
"git_sha": "285a50500f9e02578d90b3ce6382ea3c30216acd",
"installed_by": ["modules"]
},
"filtlong": {
"branch": "master",
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
"installed_by": ["modules"]
},
"freebayes": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
Expand Down
33 changes: 0 additions & 33 deletions modules/local/filtlong.nf

This file was deleted.

5 changes: 5 additions & 0 deletions modules/nf-core/filtlong/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions modules/nf-core/filtlong/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions modules/nf-core/filtlong/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 108 additions & 0 deletions modules/nf-core/filtlong/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions modules/nf-core/filtlong/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions modules/nf-core/filtlong/tests/nextflow.config

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions subworkflows/local/lr_preprocessing.nf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ include { NANOPLOT as NANOPLOT_RAW } from '../../mo
include { NANOPLOT as NANOPLOT_FILTERED } from '../../modules/nf-core/nanoplot/main'
include { NANOLYSE } from '../../modules/nf-core/nanolyse/main'
include { PORECHOP_ABI } from '../../modules/nf-core/porechop/abi/main'
include { FILTLONG } from '../../modules/local/filtlong'

include { FILTLONG } from '../../modules/nf-core/filtlong'

workflow LR_PREPROCESSING {
take:
Expand Down Expand Up @@ -57,7 +56,7 @@ workflow LR_PREPROCESSING {
ch_short_and_long_reads = ch_long_reads
.map { meta, lr -> [ meta.id, meta, lr ] }
.join(ch_short_reads_tmp, by: 0)
.map { id, meta_lr, lr, meta_sr, sr -> [ meta_lr, lr, sr[0], sr[1] ] } // should not occur for single-end, since SPAdes (hybrid) does not support single-end
.map { id, meta_lr, lr, meta_sr, sr -> [ meta_lr, sr, lr ] } // should not occur for single-end, since SPAdes (hybrid) does not support single-end

FILTLONG (
ch_short_and_long_reads
Expand All @@ -68,9 +67,10 @@ workflow LR_PREPROCESSING {
NANOPLOT_FILTERED (
ch_long_reads
)

ch_versions = ch_versions.mix(NANOPLOT_FILTERED.out.versions.first())
}

ch_versions = Channel.empty()
emit:
long_reads = ch_long_reads
versions = ch_versions
Expand Down