-
Notifications
You must be signed in to change notification settings - Fork 509
Taxonomic Update for obitools4 #7921
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
Open
kpayet26
wants to merge
27
commits into
galaxyproject:main
Choose a base branch
from
kpayet26:obitools4_taxonomic_update
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
3ebfb5f
Add new taxonomic tools and taxonomic options for old tools
kpayet26 df6fb73
Add obitag and few more test files
kpayet26 9bdfe69
changes in test
kpayet26 26a1aa7
Update tools/obitools/obicomplement.xml
kpayet26 b06ab85
Merge branch 'galaxyproject:main' into obitools4_taxonomic_update
kpayet26 d22768e
Debug test and add validator on forward and reverse parameter
kpayet26 c94cb71
Change in test taxonomy folder
kpayet26 1dacaf6
Changes on test files for obitag
kpayet26 2364d49
Changes in obirefidx test
kpayet26 4a25597
Add validator
kpayet26 487e613
add extract taxo from sequence files option to obitaxonomy
kpayet26 0361701
Add optional taxonomic options to previous tools
kpayet26 ccfd0d1
debug format macro
kpayet26 558b134
Add new options for obitaxonomy
kpayet26 a19c000
add test for obitaxonomy
kpayet26 f689f2d
add filter by rank option
kpayet26 876a418
Merge branch 'galaxyproject:main' into obitools4_taxonomic_update
kpayet26 5d81f3f
debug restrict to rank option
kpayet26 69a20a0
debug restrict rank option
kpayet26 0d8f6bc
Update tools/obitools/obipcr.xml
kpayet26 89940b3
group taxonomic options to a single macro
kpayet26 a95cb2c
Merge branch 'obitools4_taxonomic_update' of https://github.com/kpaye…
kpayet26 9cb8dd1
debug obitaxonomy
kpayet26 daee8dc
debug restrict to rank option for obiannotate and obigrep
kpayet26 e63de91
Minor changes in label and help section
kpayet26 71519ef
add more options to attributes parameter
kpayet26 71f928d
modify the help section of obirefidx
kpayet26 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <tool id="obi_complement" name="obicomplement" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@"> | ||
| <description> | ||
| Compute the reverse complement of the sequence entries. | ||
| </description> | ||
| <macros> | ||
| <import>macros.xml</import> | ||
| </macros> | ||
| <expand macro="requirements"/> | ||
| <expand macro="stdio"/> | ||
| <command><![CDATA[ | ||
| obicomplement | ||
| --no-progressbar | ||
| @INPUT_FORMAT@ | ||
| @OUT_FORMAT@ | ||
| $input | ||
| > $output | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
| ]]></command> | ||
| <inputs> | ||
| <param name="input" type="data" format="@INPUT_FORMATS@"/> | ||
| <expand macro="input_format_options_macro"/> | ||
| <expand macro="out_format_macro"/> | ||
| </inputs> | ||
| <outputs> | ||
| <data name="output" format_source="input"> | ||
| <expand macro="change_format_macro"/> | ||
| </data> | ||
| </outputs> | ||
| <tests> | ||
| <test> | ||
| <param name="input" value="output_obipairing.fastqsanger" ftype="fastqsanger"/> | ||
| <output name="output" value="output_obicomplement.fastqsanger" ftype="fastqsanger"/> | ||
| </test> | ||
| </tests> | ||
| <help> | ||
| .. class:: infomark | ||
|
|
||
| **What it does** | ||
|
|
||
| Compute the reverse complement of the sequence entries. | ||
|
bernt-matthias marked this conversation as resolved.
Outdated
|
||
|
|
||
| @OBITOOLS4_IMAGE@ | ||
|
|
||
| @OBITOOLS_LINK_OBI4@ | ||
|
|
||
| </help> | ||
| <expand macro="citation" /> | ||
|
|
||
| </tool> | ||
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,90 @@ | ||
| <tool id="obi_pcr" name="obipcr" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@"> | ||
| <description> | ||
| In sillico PCR | ||
| </description> | ||
| <macros> | ||
| <import>macros.xml</import> | ||
| </macros> | ||
| <expand macro="requirements"/> | ||
| <expand macro="stdio"/> | ||
| <command><![CDATA[ | ||
| obipcr | ||
| --no-progressbar | ||
| --forward $forward | ||
| --reverse $reverse | ||
| --max-length $max_length | ||
| -e $allowed_mismatches | ||
| #if $min_length | ||
| --min-length $min_length | ||
| #end if | ||
| $circular | ||
| #if $delta | ||
| --delta $delta | ||
| $only_complete_flanking | ||
| #end if | ||
| @TAXO_DIR_OPTIONAL@ | ||
| @INPUT_FORMAT@ | ||
| @OUT_FORMAT@ | ||
| $input | ||
| >'$output' | ||
| ]]></command> | ||
| <inputs> | ||
| <param name="input" type="data" format="@INPUT_FORMATS@"/> | ||
| <param name="forward" type="text" optional="false" label="Sequence of the forward primer" help="The forward primer used for the electronic PCR. IUPAC codes can be used in the pattern."/> | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
| <param name="reverse" type="text" optional="false" label="Sequence of the reverse primer" help="The reverse primer used for the electronic PCR. IUPAC codes can be used in the pattern."/> | ||
| <param name="max_length" type="integer" optional="false" label="Maximum length of the barcode, primers excluded."/> | ||
| <param name="min_length" type="integer" optional="true" label="Minimum length of the barcode, primers excluded."/> | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
| <param name="allowed_mismatches" type="integer" value="0" label="Maximum number of mismatches allowed for each primer"/> | ||
| <param name="circular" type="boolean" truevalue="--circular" falsevalue="" label="Considers that sequences are circular. (default: sequences are considered linear)"/> | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
| <section name="delta_option" title="delta_option"> | ||
| <param name="delta" type="integer" optional="true" label="delta" help="Without this option, only the barcode sequences will be output, without the priming sites. This option allows to add the priming sites and the flanking sequences of the priming sites over a length of delta to each side of the barcode."/> | ||
| <param name="only_complete_flanking" optional="true" type="boolean" truevalue="--only-complete-flanking" falsevalue="" label="only complete flanking" help="Works in conjunction with –delta. Prints only sequences with full-length flanking sequences (default: prints every sequence regardless of whether the flanking sequences are present)."/> | ||
| </section> | ||
| <expand macro="taxo_macro_optional"/> | ||
| <expand macro="input_format_options_macro"/> | ||
| <expand macro="out_format_macro"/> | ||
| </inputs> | ||
| <outputs> | ||
| <data format_source="input" name="output"> | ||
| <expand macro="change_format_macro"/> | ||
| </data> | ||
| </outputs> | ||
| <tests> | ||
| <test> | ||
| <param name="input" value="input_reference_dataset.fasta.gz"/> | ||
| <param name="forward" value="GGGCAATCCTGAGCCAA"/> | ||
| <param name="reverse" value="CCATTGAGTCTCTGCACCTATC"/> | ||
| <param name="max_length" value="220"/> | ||
| <param name="out_format" value="fasta"/> | ||
| <output name="output" file="output_obipcr.fasta" ftype="fasta"/> | ||
| </test> | ||
| </tests> | ||
| <help> | ||
| .. class:: infomark | ||
|
|
||
| **What it does** | ||
|
|
||
| The obipcr program is the successor of ecoPCR. It is known as an in silico PCR software. | ||
|
|
||
| * forward : The forward primer used for the electronic PCR. IUPAC codes can be used in the pattern. | ||
|
|
||
| * reverse : The reverse primer used for the electronic PCR. IUPAC codes can be used in the pattern. | ||
|
|
||
| * max length : Maximum length of the barcode, primers excluded. | ||
|
|
||
| * min length : Minimum length of the barcode primers excluded (default: no minimum length). | ||
|
|
||
| * circular : Considers that sequences are circular. (default: sequences are considered linear) | ||
|
|
||
| * delta : Without this option, only the barcode sequences will be output, without the priming sites. This option allows to add the priming sites and the flanking sequences of the priming sites over a length of delta to each side of the barcode. | ||
|
|
||
| * only complete flanking : Works in conjunction with –delta. Prints only sequences with full-length flanking sequences (default: prints every sequence regardless of whether the flanking sequences are present). | ||
|
|
||
| @OBITOOLS4_IMAGE@ | ||
|
|
||
| @OBITOOLS_LINK_OBI4@ | ||
|
|
||
| </help> | ||
| <expand macro="citation" /> | ||
|
|
||
| </tool> | ||
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,52 @@ | ||
| <tool id="obi_refidx" name="obirefidx" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@"> | ||
| <description> | ||
| Index the database | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
| </description> | ||
| <macros> | ||
| <import>macros.xml</import> | ||
| </macros> | ||
| <expand macro="requirements"/> | ||
| <expand macro="stdio"/> | ||
| <command><![CDATA[ | ||
| obirefidx | ||
| --no-progressbar | ||
| @TAXO_DIR@ | ||
| @INPUT_FORMAT@ | ||
| @OUT_FORMAT@ | ||
| $input | ||
| >'$output' | ||
| ]]></command> | ||
| <inputs> | ||
| <param name="input" type="data" format="@INPUT_FORMATS@"/> | ||
| <expand macro="taxo_macro"/> | ||
| <expand macro="input_format_options_macro"/> | ||
| <expand macro="out_format_macro"/> | ||
| </inputs> | ||
| <outputs> | ||
| <data format_source="input" name="output"> | ||
| <expand macro="change_format_macro"/> | ||
| </data> | ||
| </outputs> | ||
| <tests> | ||
| <test expect_num_outputs="1"> | ||
| <param name="input" value="db_v05_r117.fasta.gz" ftype="fasta.gz"/> | ||
| <conditional name="taxonomy"> | ||
| <param name="taxonomy_source" value="history"/> | ||
| <param name="taxdump" value="taxdump_mammalia_old.csv.gz"/> | ||
| </conditional> | ||
| <output name="output" file="output_obirefidx_db.fasta.gz" ftype="fasta.gz"/> | ||
| </test> | ||
| </tests> | ||
| <help> | ||
| .. class:: infomark | ||
|
|
||
| **What it does** | ||
|
kpayet26 marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
|
|
||
| @OBITOOLS_LINK_OBI4@ | ||
|
|
||
| </help> | ||
| <expand macro="citation" /> | ||
|
|
||
| </tool> | ||
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.