Skip to content

Fix kraken db loading fromPath #673

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.

Sign up for GitHub

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

Merged
apeltzer merged 7 commits into from
Feb 3, 2021
Merged

Fix kraken db loading fromPath #673

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0468dfa
fix kraken db loading fromPath
Feb 1, 2021
ee88d1c
Merge branch 'dev' of github.com:nf-core/eager into dev
Feb 1, 2021
1fd116d
update changelog
Feb 1, 2021
f8fa322
change basenaming of database
Feb 1, 2021
6724770
renaming archive files in decomp kraken
Feb 1, 2021
fea3249
handle case when files are already in $dbdir
Feb 2, 2021
d89b4cc
transforms to value channel with .first()
Feb 3, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [#631](https://github.com/nf-core/eager/issues/631): - Update minimum Nextflow version to 20.07.1, due to unfortunate bug in Nextflow 20.04.1 causing eager to crash if patch pulled
- Made MultiQC crash behaviour stricter when dealing with large datasets, as reported by @ashildv
- Added note to documentation that when using `--skip_collapse` this will use _paired-end_ alignment mode with mappers when using PE data. `
- [#673](https://github.com/nf-core/eager/pull/673): Fix Kraken database loading when loading from directory instead of compressed file.

### `Dependencies`

Expand Down
6 changes: 4 additions & 2 deletions main.nf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3108,14 +3108,16 @@ if (params.run_metagenomic_screening && params.database.endsWith(".tar.gz") && p
path(dbname) into ch_krakendb

script:
dbname = params.database.tokenize("/")[-1].tokenize(".")[0]
dbname = ckdb.toString() - '.tar.gz'
Comment thread
apeltzer marked this conversation as resolved.
"""
tar xvzf $ckdb
mkdir -p $dbname
mv *.k2d $dbname
"""
}

} else if (! params.database.endsWith(".tar.gz") && params.run_metagenomic_screening && params.metagenomic_tool == 'kraken') {
ch_krakendb = path(params.database)
ch_krakendb = Channel.fromPath(params.database)
Comment thread
maxibor marked this conversation as resolved.
Outdated
} else {
ch_krakendb = Channel.empty()
}
Expand Down
⚡