| Previous changeset 6:382cde407f81 (2018-01-11) Next changeset 8:f08c0b980c03 (2018-03-20) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 58476cadaaf10b494317a604ad81d41c2d15f29b |
|
modified:
IDFilter.xml macros.xml readme.md |
|
added:
tools_blacklist.txt |
|
removed:
SKIP_TOOLS_FILE.txt |
| b |
| diff -r 382cde407f81 -r 54be6743323c IDFilter.xml --- a/IDFilter.xml Thu Jan 11 17:51:39 2018 -0500 +++ b/IDFilter.xml Mon Feb 12 12:59:01 2018 -0500 |
| [ |
| b'@@ -1,7 +1,7 @@\n <?xml version=\'1.0\' encoding=\'UTF-8\'?>\n-<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTD2Galaxy.-->\n+<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTDConverter.-->\n <!--Proposed Tool Section: [ID Processing]-->\n-<tool id="IDFilter" name="IDFilter" version="2.2.0">\n+<tool id="IDFilter" name="IDFilter" version="2.3.0">\n <description>Filters results from protein or peptide identification engines based on different criteria.</description>\n <macros>\n <token name="@EXECUTABLE@">IDFilter</token>\n@@ -225,7 +225,7 @@\n <param name="param_score_pep" type="float" value="0.0" label="The score which should be reached by a peptide hit to be kept" help="(-pep) "/>\n <param name="param_score_prot" type="float" value="0.0" label="The score which should be reached by a protein hit to be kept" help="(-prot) Use in combination with \'delete_unreferenced_peptide_hits\' to remove affected peptides"/>\n <param name="param_whitelist_proteins" type="data" format="fasta" optional="True" label="Filename of a FASTA file containing protein sequences" help="(-proteins) <br>All peptides that are not referencing a protein in this file are removed. <br>All proteins whose accessions are not present in this file are removed"/>\n- <repeat name="rep_param_whitelist_protein_accessions" min="0" max="1" title="param_whitelist_protein_accessions">\n+ <repeat name="rep_param_whitelist_protein_accessions" min="0" title="param_whitelist_protein_accessions">\n <param name="param_whitelist_protein_accessions" type="text" size="30" label="All peptides that do not reference at least one of the provided protein accession are removed" help="(-protein_accessions) <br>Only proteins of the provided list are retained">\n <sanitizer>\n <valid initial="string.printable">\n@@ -237,7 +237,7 @@\n </repeat>\n <param name="param_whitelist_peptides" type="data" format="idxml" optional="True" label="Only peptides with the same sequence and modification assignment as any peptide in this file are kept" help="(-peptides) Use with \'whitelist:ignore_modifications\' to only compare by sequence. <br>"/>\n <param name="param_whitelist_ignore_modifications" display="radio" type="boolean" truevalue="-whitelist:ignore_modifications" falsevalue="" checked="false" optional="True" label="Compare whitelisted peptides by sequence only" help="(-ignore_modifications) "/>\n- <repeat name="rep_param_whitelist_modifications" min="0" max="1" title="param_whitelist_modifications">\n+ <repeat name="rep_param_whitelist_modifications" min="0" title="param_whitelist_modifications">\n <param name="param_whitelist_modifications" type="select" optional="True" label="Keep only peptides with sequences that contain (any of) the selected modification(s)" help="(-modifications) ">\n <option value="15N-oxobutanoic (N-term C)">15N-oxobutanoic (N-term C)</option>\n <option value="2-dimethylsuccinyl (C)">2-dimethylsuccinyl (C)</option>\n@@ -2771,7 +2771,7 @@\n </param>\n </repeat>\n <param name="param_blacklist_proteins" type="data" format="fasta" optional="True" label="Filename of a FASTA file containing protein sequences" help="(-proteins) <br>All peptides that are referencing a protein in this file are removed. <br>All proteins whose accessions are present in this file are removed"/>\n- <repeat name="rep_param_blacklist_protein_accessions" min="0" max="1" title="param_blacklist_protein_accessions">\n+ <repeat name="rep_param_blacklist_protein_accessions" min="0" title="param_blacklist_protein_accessions">\n <param name="param_blacklist_protein_accessions" type="text" size="30" label="All peptides that reference at least one of the provided protein accession are removed" help="(-'..b'n_accessions) <br>Only proteins not in the provided list are retained">\n <sanitizer>\n <valid initial="string.printable">\n@@ -2783,7 +2783,7 @@\n </repeat>\n <param name="param_blacklist_peptides" type="data" format="idxml" optional="True" label="Peptides with the same sequence and modification assignment as any peptide in this file are filtered out" help="(-peptides) Use with \'blacklist:ignore_modifications\' to only compare by sequence. <br>"/>\n <param name="param_blacklist_ignore_modifications" display="radio" type="boolean" truevalue="-blacklist:ignore_modifications" falsevalue="" checked="false" optional="True" label="Compare blacklisted peptides by sequence only" help="(-ignore_modifications) "/>\n- <repeat name="rep_param_blacklist_modifications" min="0" max="1" title="param_blacklist_modifications">\n+ <repeat name="rep_param_blacklist_modifications" min="0" title="param_blacklist_modifications">\n <param name="param_blacklist_modifications" type="select" optional="True" label="Remove all peptides with sequences that contain (any of) the selected modification(s)" help="(-modifications) ">\n <option value="15N-oxobutanoic (N-term C)">15N-oxobutanoic (N-term C)</option>\n <option value="2-dimethylsuccinyl (C)">2-dimethylsuccinyl (C)</option>\n@@ -5318,26 +5318,31 @@\n </repeat>\n <param name="param_digest_fasta" type="data" format="fasta" optional="True" label="Input sequence database in FASTA format" help="(-fasta) "/>\n <param name="param_digest_enzyme" type="select" optional="False" value="Trypsin" label="Specify the digestion enzyme" help="(-enzyme) ">\n+ <option value="V8-DE">V8-DE</option>\n+ <option value="Asp-N_ambic">Asp-N_ambic</option>\n+ <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>\n+ <option value="Lys-N">Lys-N</option>\n+ <option value="TrypChymo">TrypChymo</option>\n+ <option value="leukocyte elastase">leukocyte elastase</option>\n <option value="Formic_acid">Formic_acid</option>\n+ <option value="Arg-C">Arg-C</option>\n+ <option value="Trypsin/P">Trypsin/P</option>\n+ <option value="Trypsin" selected="true">Trypsin</option>\n+ <option value="proline endopeptidase">proline endopeptidase</option>\n+ <option value="PepsinA">PepsinA</option>\n+ <option value="V8-E">V8-E</option>\n+ <option value="CNBr">CNBr</option>\n+ <option value="no cleavage">no cleavage</option>\n+ <option value="Alpha-lytic protease">Alpha-lytic protease</option>\n <option value="unspecific cleavage">unspecific cleavage</option>\n- <option value="V8-DE">V8-DE</option>\n- <option value="PepsinA">PepsinA</option>\n+ <option value="Chymotrypsin/P">Chymotrypsin/P</option>\n <option value="Asp-N">Asp-N</option>\n- <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>\n- <option value="Trypsin/P">Trypsin/P</option>\n <option value="2-iodobenzoate">2-iodobenzoate</option>\n- <option value="TrypChymo">TrypChymo</option>\n <option value="Lys-C/P">Lys-C/P</option>\n+ <option value="Asp-N/B">Asp-N/B</option>\n <option value="Lys-C">Lys-C</option>\n- <option value="CNBr">CNBr</option>\n- <option value="V8-E">V8-E</option>\n- <option value="proline endopeptidase">proline endopeptidase</option>\n <option value="Chymotrypsin">Chymotrypsin</option>\n- <option value="leukocyte elastase">leukocyte elastase</option>\n- <option value="Asp-N_ambic">Asp-N_ambic</option>\n- <option value="no cleavage">no cleavage</option>\n- <option value="Trypsin" selected="true">Trypsin</option>\n- <option value="Arg-C">Arg-C</option>\n+ <option value="Arg-C/P">Arg-C/P</option>\n </param>\n <param name="param_digest_specificity" display="radio" type="select" optional="False" value="full" label="Specificity of the filte" help="(-specificity) ">\n <option value="full" selected="true">full</option>\n' |
| b |
| diff -r 382cde407f81 -r 54be6743323c SKIP_TOOLS_FILE.txt --- a/SKIP_TOOLS_FILE.txt Thu Jan 11 17:51:39 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,9 +0,0 @@ -OMSSAAdapter -MyriMatchAdapter -PepNovoAdapter -SeedListGenerator -SpecLibSearcher -MapAlignerIdentification -MapAlignerPoseClustering -MapAlignerSpectrum -MapAlignerRTTransformer |
| b |
| diff -r 382cde407f81 -r 54be6743323c macros.xml --- a/macros.xml Thu Jan 11 17:51:39 2018 -0500 +++ b/macros.xml Mon Feb 12 12:59:01 2018 -0500 |
| b |
| @@ -2,10 +2,10 @@ <macros> <xml name="requirements"> <requirements> - <requirement type="package" version="2.2">openms</requirement> + <requirement type="package" version="2.3">openms</requirement> <requirement type="package" version="15.12.15.2">xtandem</requirement> <requirement type="package" version="1.0">fido</requirement> - <requirement type="package" version="2016.10.26">msgf_plus</requirement> + <requirement type="package" version="2017.07.21">msgf_plus</requirement> <yield/> </requirements> </xml> |
| b |
| diff -r 382cde407f81 -r 54be6743323c readme.md --- a/readme.md Thu Jan 11 17:51:39 2018 -0500 +++ b/readme.md Mon Feb 12 12:59:01 2018 -0500 |
| b |
| @@ -53,29 +53,29 @@ * clone or install CTD2Galaxy ```bash - git clone https://github.com/WorkflowConversion/CTD2Galaxy.git + git clone https://github.com/WorkflowConversion/CTDConverter.git ``` - * If you have CTDopts and CTD2Galaxy installed you are ready to generate Galaxy Tools from CTD definitions. Change the following command according to your needs, especially the `/PATH/TO` parts. The default files are provided in this repository. You might have to install `libxslt` and `lxml` to run it. + * If you have CTDopts and CTDConverter installed you are ready to generate Galaxy Tools from CTD definitions. Change the following command according to your needs, especially the `/PATH/TO` parts. The default files are provided in this repository. You might have to install `libxslt` and `lxml` to run it. Further information can be found on the CTDConverter page. ```bash - python generator.py \ + python convert.py galaxy \ -i /PATH/TO/YOUR/CTD/*.ctd \ -o ./PATH/TO/YOUR/WRAPPERS/ -t tool.conf \ -d datatypes_conf.xml -g openms \ -b version log debug test no_progress threads \ in_type executable myrimatch_executable \ fido_executable fidocp_executable \ - omssa_executable pepnovo_executable \ + omssa_executable pepnovo_e xecutable \ xtandem_executable param_model_directory \ java_executable java_memory java_permgen \ r_executable rt_concat_trafo_out param_id_pool \ -f /PATH/TO/filetypes.txt -m /PATH/TO/macros.xml \ - -s PATH/TO/SKIP_TOOLS_FILES.txt + -s PATH/TO/tools_blacklist.txt ``` - * As last step you need to change manually the binary names of all external binaries you want to use in OpenMS. For example: + * As last step you need to change manually the binary names of all external binaries you want to use in OpenMS. Some of these tools might already be deprecated and the files might not exist: ``` sed -i '13 a\-fido_executable Fido' wrappers/FidoAdapter.xml @@ -171,8 +171,8 @@ ``` - * These tools have multiple outputs (number of inputs = number of outputs) which is not yet supported in - by the automatic conversion step and are therefore in `SKIP_TOOLS_FILES.txt`: + * `This section might not be up to date. It might be worth trying if these tools will run now.` These tools have multiple outputs (number of inputs = number of outputs) which is not yet supported in + by the automatic conversion step and are therefore in `tools_blacklist.txt`: * SeedListGenerator * SpecLibSearcher * MapAlignerIdentification |
| b |
| diff -r 382cde407f81 -r 54be6743323c tools_blacklist.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools_blacklist.txt Mon Feb 12 12:59:01 2018 -0500 |
| b |
| @@ -0,0 +1,9 @@ +OMSSAAdapter +MyriMatchAdapter +PepNovoAdapter +SeedListGenerator +SpecLibSearcher +MapAlignerIdentification +MapAlignerPoseClustering +MapAlignerSpectrum +MapAlignerRTTransformer |