| Previous changeset 6:79197a523dd0 (2018-01-11) Next changeset 8:f3652886728b (2018-03-20) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 58476cadaaf10b494317a604ad81d41c2d15f29b |
|
modified:
FeatureLinkerUnlabeledQT.xml macros.xml readme.md |
|
added:
tools_blacklist.txt |
|
removed:
SKIP_TOOLS_FILE.txt |
| b |
| diff -r 79197a523dd0 -r 5e3b60ab2b05 FeatureLinkerUnlabeledQT.xml --- a/FeatureLinkerUnlabeledQT.xml Thu Jan 11 17:46:45 2018 -0500 +++ b/FeatureLinkerUnlabeledQT.xml Mon Feb 12 13:04:00 2018 -0500 |
| [ |
| @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> -<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTD2Galaxy.--> +<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTDConverter.--> <!--Proposed Tool Section: [Map Alignment]--> -<tool id="FeatureLinkerUnlabeledQT" name="FeatureLinkerUnlabeledQT" version="2.2.0"> +<tool id="FeatureLinkerUnlabeledQT" name="FeatureLinkerUnlabeledQT" version="2.3.0"> <description>Groups corresponding features from multiple maps.</description> <macros> <token name="@EXECUTABLE@">FeatureLinkerUnlabeledQT</token> @@ -19,6 +19,9 @@ #if $param_out: -out $param_out #end if +#if $param_design: + -design $param_design +#end if #if $param_keep_subelements: -keep_subelements #end if @@ -86,6 +89,7 @@ </valid> </sanitizer> </param> + <param name="param_design" type="data" format="tabular" optional="True" label="input file containing the experimental design" help="(-design) "/> <param name="param_keep_subelements" display="radio" type="boolean" truevalue="-keep_subelements" falsevalue="" checked="false" optional="True" label="For consensusXML input only: If set, the sub-features of the inputs are transferred to the output" help="(-keep_subelements) "/> <param name="param_algorithm_use_identifications" display="radio" type="boolean" truevalue="-algorithm:use_identifications" falsevalue="" checked="false" optional="True" label="Never link features that are annotated with different peptides (only the best hit per peptide identification is taken into account)" help="(-use_identifications) "/> <param name="param_algorithm_nr_partitions" type="integer" min="1" optional="True" value="100" label="How many partitions in m/z space should be used for the algorithm (more partitions means faster runtime and more memory efficient execution )" help="(-nr_partitions) "/> |
| b |
| diff -r 79197a523dd0 -r 5e3b60ab2b05 SKIP_TOOLS_FILE.txt --- a/SKIP_TOOLS_FILE.txt Thu Jan 11 17:46:45 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 79197a523dd0 -r 5e3b60ab2b05 macros.xml --- a/macros.xml Thu Jan 11 17:46:45 2018 -0500 +++ b/macros.xml Mon Feb 12 13:04:00 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 79197a523dd0 -r 5e3b60ab2b05 readme.md --- a/readme.md Thu Jan 11 17:46:45 2018 -0500 +++ b/readme.md Mon Feb 12 13:04:00 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 79197a523dd0 -r 5e3b60ab2b05 tools_blacklist.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools_blacklist.txt Mon Feb 12 13:04:00 2018 -0500 |
| b |
| @@ -0,0 +1,9 @@ +OMSSAAdapter +MyriMatchAdapter +PepNovoAdapter +SeedListGenerator +SpecLibSearcher +MapAlignerIdentification +MapAlignerPoseClustering +MapAlignerSpectrum +MapAlignerRTTransformer |