| Previous changeset 6:406855426f41 (2018-01-11) Next changeset 8:efd9d9e7fd2c (2018-03-20) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 58476cadaaf10b494317a604ad81d41c2d15f29b |
|
modified:
FileConverter.xml macros.xml readme.md |
|
added:
tools_blacklist.txt |
|
removed:
SKIP_TOOLS_FILE.txt |
| b |
| diff -r 406855426f41 -r 1fe84d73c19c FileConverter.xml --- a/FileConverter.xml Thu Jan 11 18:06:14 2018 -0500 +++ b/FileConverter.xml Mon Feb 12 13:06:03 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: [File Handling]--> -<tool id="FileConverter" name="FileConverter" version="2.2.0"> +<tool id="FileConverter" name="FileConverter" version="2.3.0"> <description>Converts between different MS file formats.</description> <macros> <token name="@EXECUTABLE@">FileConverter</token> @@ -44,6 +44,9 @@ #if $adv_opts.param_force_MaxQuant_compatibility: -force_MaxQuant_compatibility #end if + #if $adv_opts.param_force_TPP_compatibility: + -force_TPP_compatibility +#end if #if $adv_opts.param_write_scan_index: -write_scan_index #if " " in str($adv_opts.param_write_scan_index): @@ -89,6 +92,7 @@ <param name="param_TIC_DTA2D" display="radio" type="boolean" truevalue="-TIC_DTA2D" falsevalue="" checked="false" optional="True" label="Export the TIC instead of the entire experiment in mzML/mzData/mzXML -> DTA2D conversions" help="(-TIC_DTA2D) "/> <param name="param_MGF_compact" display="radio" type="boolean" truevalue="-MGF_compact" falsevalue="" checked="false" optional="True" label="Use a more compact format when writing MGF (no zero-intensity peaks, limited number of decimal places)" help="(-MGF_compact) "/> <param name="param_force_MaxQuant_compatibility" display="radio" type="boolean" truevalue="-force_MaxQuant_compatibility" falsevalue="" checked="false" optional="True" label="[mzXML output only] Make sure that MaxQuant can read the mzXML and set the msManufacturer to 'Thermo Scientific'" help="(-force_MaxQuant_compatibility) "/> + <param name="param_force_TPP_compatibility" display="radio" type="boolean" truevalue="-force_TPP_compatibility" falsevalue="" checked="false" optional="True" label="[mXML output only] Make sure that TPP parsers can read the mzML and the precursor ion m/z in the file (otherwise it will be set to zero by the TPP)" help="(-force_TPP_compatibility) "/> <param name="param_write_scan_index" display="radio" type="select" optional="False" value="true" label="Append an index when writing mzML or mzXML files" help="(-write_scan_index) Some external tools might rely on it"> <option value="true" selected="true">true</option> <option value="false">false</option> |
| b |
| diff -r 406855426f41 -r 1fe84d73c19c SKIP_TOOLS_FILE.txt --- a/SKIP_TOOLS_FILE.txt Thu Jan 11 18:06:14 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 406855426f41 -r 1fe84d73c19c macros.xml --- a/macros.xml Thu Jan 11 18:06:14 2018 -0500 +++ b/macros.xml Mon Feb 12 13:06:03 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 406855426f41 -r 1fe84d73c19c readme.md --- a/readme.md Thu Jan 11 18:06:14 2018 -0500 +++ b/readme.md Mon Feb 12 13:06:03 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 406855426f41 -r 1fe84d73c19c tools_blacklist.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools_blacklist.txt Mon Feb 12 13:06:03 2018 -0500 |
| b |
| @@ -0,0 +1,9 @@ +OMSSAAdapter +MyriMatchAdapter +PepNovoAdapter +SeedListGenerator +SpecLibSearcher +MapAlignerIdentification +MapAlignerPoseClustering +MapAlignerSpectrum +MapAlignerRTTransformer |