-
Notifications
You must be signed in to change notification settings - Fork 35
Add run_dbcan screening for the CAZyme (carbohydrate active enzyme) and CGC (CAZyme Gene Cluster) annotation #483
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
Merged
Merged
Changes from 78 commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
6353679
Add run_dbcan screening
HaidYi 15f2ef5
fix missing gffs
HaidYi d5df4a1
split dbcan results by meta.id
HaidYi f049e2f
rm constraints of annotation tool
HaidYi 8289bdb
add test config for rundbcan
HaidYi d8af5e9
add test profile for rundbcan in ci
HaidYi 0a5e505
add dbcan in the refs
HaidYi 01a573a
Suggestions from code review
5c5ec66
rm duplicate outputs
HaidYi 9fd005c
add manual dbCAN database download
HaidYi ea4b852
rename DBCAN to CAZYME
HaidYi 62623a5
add gff column in samplesheet
HaidYi 0cad8f9
change run_dbcan_screening to run_cazyme_screening
HaidYi b76e3a2
add missing identifier
HaidYi 0f5863a
add missing identifier
HaidYi f2d79d5
add missing conda
HaidYi 625ced4
fix typo
HaidYi 58273f1
re-organize the outdir structure of cazyme screening
HaidYi a638f32
add citation
HaidYi a5d692b
add cazyme_skip_dbcan param
HaidYi da9d4a4
fix missing ','
HaidYi 9f3af6c
add gff type parameter for dbcan
HaidYi 15645fb
mv hard-coded gff type to params
HaidYi 448145b
Merge remote-tracking branch 'origin/dev' into rundbcan
jfy133 8e48936
fix typo
HaidYi 101a159
fix format
HaidYi 9c14e24
fix lint issue
HaidYi 0899e10
Merge branch 'dev' into rundbcan
HaidYi 63c8b04
Fix snapshot
jfy133 03b1030
Fix RO crate
jfy133 cce04b2
only list top view
HaidYi ddd51c1
Update docs/output.md
HaidYi b31feb6
Update docs/output.md
HaidYi 36c22d3
Update docs/output.md
HaidYi 59385f9
Update docs/output.md
HaidYi 2a6544e
Update docs/output.md
HaidYi 2dbe952
Update docs/output.md
HaidYi 01fb374
add a column: gff_type in samplesheet
HaidYi 13b82ab
rm dbcan_gff_type parameter
HaidYi 3af937f
add option for using local dbcan db
HaidYi c28f049
filter samples for dbcan cgc/substrate if no gff_type provided in sam…
HaidYi 796b96d
add cazyme to toolCitationText
HaidYi 6de2005
Update docs/output.md
HaidYi 5f9b432
update the profile name
HaidYi e114734
add cazyme_screening to default test
HaidYi 6ee4dd7
add test_cazyme_pyrodigal test
HaidYi 18ba885
add cazyme_dbcan_db to params
HaidYi 161d37d
fix bug
HaidYi d505ea6
add gff_type in meta for cazyme screening
HaidYi 69d5133
Merge branch 'dev' into rundbcan
jfy133 f5ed73e
[automated] Fix code linting
nf-core-bot c3c09c9
Merge branch 'dev' into rundbcan
jfy133 0ef0ade
rm `set` and use =
HaidYi fdb238a
Update subworkflows/local/cazyme.nf
HaidYi 6af2309
Update workflows/funcscan.nf
HaidYi e4a4784
Update nextflow.config
HaidYi 41e9466
Update nextflow.config
HaidYi 6cb3a41
update the name
HaidYi 99c0c19
add the icon
HaidYi 1132b7e
Merge branch 'dev' into rundbcan
jfy133 07a7d71
update the rundbcan/database
HaidYi 497d6d1
recompute hash
HaidYi bab0e18
update rundbcan modules
HaidYi c0c76dc
update the default test snap
HaidYi 7a921b4
remove one assertion for the upgraded package
HaidYi d2e8e94
update the test cazyme pyrodigal snap file
HaidYi 4b5a342
Merge branch 'dev' into rundbcan
jfy133 737db6c
Apply suggestions from code review
jfy133 3b9bbab
Apply suggestions from code review
jfy133 b6c0aab
fix comments
HaidYi 3c9c118
update the doc/usage
HaidYi 49ef6d9
update contributor
HaidYi 0618e35
add help_texts
HaidYi 8be0c33
add to contributor
HaidYi ebe8bc4
update changelog
HaidYi 80f7f1e
add more cazyme tests
HaidYi b54a6e7
[automated] Fix code linting
nf-core-bot 97c9bb9
Apply suggestion from @jfy133
jfy133 8103a8a
Apply suggestions from code review
jfy133 419e389
Restructure tests
jfy133 35f9c4b
Merge branch 'dev' into rundbcan
jfy133 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| sample,fasta,protein,gbk | ||
| sample,fasta,protein,gbk,gff | ||
| sample_1,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_1.fasta.gz,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_prokka_1.faa,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_prokka_1.gbk | ||
| sample_2,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_2.fasta.gz,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_prokka_2.faa.gz,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs_prokka_2.gbk.gz | ||
| sample_3,https://raw.githubusercontent.com/nf-core/test-datasets/funcscan/wastewater_metagenome_contigs.fasta |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HaidYi marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
jfy133 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| Nextflow config file for running minimal tests | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| Defines input files and everything required to run a fast and simple pipeline test. | ||
|
|
||
| Use as follows: | ||
| nextflow run nf-core/funcscan -profile test_dbcan_pyrodigal,<docker/singularity> --outdir <OUTDIR> | ||
|
|
||
| ---------------------------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| process { | ||
| resourceLimits = [ | ||
| cpus: 4, | ||
| memory: '15.GB', | ||
| time: '1.h' | ||
| ] | ||
| } | ||
|
|
||
| params { | ||
| config_profile_name = 'CAZyme Pyrodigal test profile' | ||
| config_profile_description = 'Minimal test dataset to check CAZyme workflow function' | ||
|
|
||
| // Input data | ||
| input = params.pipelines_testdata_base_path + 'funcscan/samplesheet_reduced.csv' | ||
|
|
||
| annotation_tool = 'pyrodigal' | ||
|
|
||
| run_arg_screening = false | ||
| run_amp_screening = false | ||
| run_bgc_screening = false | ||
| run_cazyme_screening = true | ||
| } | ||
HaidYi marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| Nextflow config file for running minimal tests | ||
jfy133 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| Defines input files and everything required to run a fast and simple pipeline test. | ||
|
|
||
| Use as follows: | ||
| nextflow run nf-core/funcscan -profile test_preannotated_cazyme,<docker/singularity> --outdir <OUTDIR> | ||
|
|
||
| ---------------------------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| process { | ||
| resourceLimits = [ | ||
| cpus: 4, | ||
| memory: '15.GB', | ||
| time: '1.h' | ||
| ] | ||
| } | ||
|
|
||
| params { | ||
| config_profile_name = 'CAZyme test profile - preannotated input' | ||
| config_profile_description = 'Minimal test dataset to check CAZyme workflow function' | ||
|
|
||
| // Input data | ||
| input = params.pipelines_testdata_base_path + 'funcscan/samplesheet_preannotated.csv' | ||
|
|
||
| annotation_tool = 'pyrodigal' | ||
|
|
||
| run_arg_screening = false | ||
| run_amp_screening = false | ||
| run_bgc_screening = false | ||
| run_cazyme_screening = true | ||
|
|
||
| dbcan_skip_cgc = false // CGC annotation enabled as .gff is provided in samplesheet | ||
| dbcan_skip_substrate = false // Substrate annotation enabled as .gff is provided in samplesheet | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.