# HG changeset patch # User bgruening # Date 1741193196 0 # Node ID 1233363389c117cb2597260643ae0ff340711759 # Parent 8e649f27aa0dda757c545f52f0d47506f12c6627 planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/mafft commit 16082a6848975215c251a4440c7c3c359fc7d34c diff -r 8e649f27aa0d -r 1233363389c1 macros.xml --- a/macros.xml Thu Aug 22 19:20:24 2024 +0000 +++ b/macros.xml Wed Mar 05 16:46:36 2025 +0000 @@ -1,6 +1,6 @@ 7.526 - 0 + 1 22.01 diff -r 8e649f27aa0d -r 1233363389c1 mafft-add.xml --- a/mafft-add.xml Thu Aug 22 19:20:24 2024 +0000 +++ b/mafft-add.xml Wed Mar 05 16:46:36 2025 +0000 @@ -17,11 +17,11 @@ #elif $sequences.sequenceType == 'group' --addprofile input_dir/sequence #end if - $keeplength - $mapout + $keeplength + $mapout $reorder input_dir/alignment > '$outputAlignment' - + #if $mapout && mv input_dir/sequence.map '$outputmap' #end if @@ -29,7 +29,7 @@ @@ -66,10 +66,12 @@ - - - - + + + + + + diff -r 8e649f27aa0d -r 1233363389c1 mafft.xml --- a/mafft.xml Thu Aug 22 19:20:24 2024 +0000 +++ b/mafft.xml Wed Mar 05 16:46:36 2025 +0000 @@ -107,6 +107,7 @@ ## handle scoring matrix $datatype_selection.datatype + $anysymbol #if $datatype_selection.datatype != "" #if $datatype_selection.scoring_matrix.type == "custom" --aamatrix '$datatype_selection.scoring_matrix.aamatrix' @@ -143,7 +144,7 @@ #if $input.mapping == "implicit" #for $batch in $input.batches: cat $batch.inputs >> input.fa - #end for + #end for #elif $input.mapping == "merge" #for $batch in $input.batches: #for $dataset in $batch.inputs: @@ -217,6 +218,7 @@ + @@ -343,6 +345,17 @@ + + + + + + + + + + + diff -r 8e649f27aa0d -r 1233363389c1 test-data/amino_withU.fa --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/amino_withU.fa Wed Mar 05 16:46:36 2025 +0000 @@ -0,0 +1,56 @@ +>CALJE_DJ01Gene08198 +MDRVKNQNEDLLSGVVPLMKLLCLTVIGLVLAHPKIQIVPRATFKLLSKLVFALFLPCLI +FVHLGESVTLNSVLLWWFVPVNVLISTAIGCALGYIVAIICRPPPQFYRFAVIMTGFGNT +GNLPIAIVGSVCHSSENPFGPDCHRTGVAYVSFAQWVAVILVYTLVYHMMEPPMQYYEIV +SEENEIQEETVNNISRPLLHEAEWPGMVDKETVHSKTPFIARVFMSISGSSQNTFPDLDL +TEDGGAGPSSPKSLRCLAEPKVVRRIRIVAEETPIRHILQPPTIASLLALIVGMVPLFRD +FVFGTDAPLSFFTDSLEILAGAVVPSVMLILGGMLAEGPNDSALGTRTMIGITVARLLVL +PLVGIGVVALADKLNFLVEGDQMYRFVLLLQYTTPSAILLGAIASLRVMLSRKLRHSCSG +STSVQUSSNSICNLLILLHSLADEDVGASQSGELIKGTDATRHQLFPGKDAGFAREQRHG +FHAAEVFIAPCSQKEEKMLFEARRLVRWGFHEPHGPRHAAFQPWPDLSRARKHCLAPEAG +VDSIAKSAHRSHFSAFSPTP +>CALJE_DJ01Gene07324 +MHQKRDIDPADLWLPYSFRSSNMISLATVYHVLEATVPLYAAMMLAYLSIKWWKLFTPDQ +CTGINKFVAKFSVPLLSFHVISTNNPYQMNLKLLFSDSMQKILALLFFAVISKACFRGSL +DWLITGFSLSTLPNTLIVGIPLLKDLYGDEAAKLLGQIIVLQSLVWYTLLLFLFEFRVAK +AVAANRNDNTGELEASGGMQPKPEEDEAKTLSMRSIKSLLMKSLLILCMVGKKLMINPNT +YASLAGFVWALISFRWGIELPLMIRSCISILSDGGLGMAMFSLGLFTASQSSIIACGTRM +MVLSMGLRFIVGPALIAIPSYAIGMRATLLKVAIVQAALPQGIVPWVFAKEYGVQPDILS +TGVIIGMIIAVPIALAYYSILDHN +>CALJE_DJ01Gene04286 +MITWHDLYTVLTAVVPLYVAMILAYGSVRWWRIFSPDQCSGINRFVAIFAVPLLSFHFIS +TNNPYTMNFRFIAADTLQKLIVLSALAAWARLSSRGSLDWAITVFSLATLPNTLVMGIPL +LIAMYGSFSGSLMVQIVVLQCIIWYTLLLFLFEYRAARLLIADQFPDTAASIVSFRVDSD +VVSLDGGRDLLQADAEVGGDGKIHVTVRRSNASRRSVSMAMTPRPSNLTGAEIYSLSSSR +NPTPRGSNFNHSDFFAMVGGAPPPLRPSNFGPADLYSLHSSRGPTPRPSNFDDGAAVGSP +RFVHYPAPNPEISASAPVTKKPTPTNPAPPSTAAATQQQNRAAHHDAKELHMFVWSSSAS +PVSEVGGLHVFGGADFAAPDLAGRPDHGGAKEIRMLIPTDLPQNGGTKGVAIPEGEDYGG +GGEDFSFGGGKGLEDLVGRDKENGPEGLSKLGSSSTAELHPKGGGGPSDGAKQAHPQMPP +ASVMTRLILIMVWRKLIRNPNTYSSLIGLIWSLVAFRWHVTMPKIVEKSISILSDAGLGM +AMFSLGLFMALQPKIIACGNSVATFAMAVRFLTGPAVMAAASIAVGLRGVLLHVAIVQAA +LPQGIVPFVFAKEYNVHPAILSTAVIFGMLIALPITLVYYIILGL +>CALJE_DJ01Gene08527 +MISLVIVYHVLEATVPLYAAMILAYLSVKWWKLFTPDQCTGINNFVAKFSVPLLSFHVIS +PNNPYPINLKLLFSDSVQKILALLVFAVLSRPCFRGSLDWLITGFSTSTLPNTLIIGIPL +LKGLYGDEAVKLLGQIIVLQSLVWNTLLLFLFEVRAAKAVAANPTDNTGELESSGGIQPK +PEEDEVKCLLAGFIWALILFRWEVELPLIISKCISILSDGGLGMAMFSLGLFMASQSSII +ASGTWMMVLSMGLRFIIGPALIAIPSYAIGLRATLLKVAIVQAALPQGIVPFVFAKEYSV +HPDILSTGFKLDQGFLLADERAIEKIDAVELRENPDNEMGRSPESRRKGAVIVPIISDAI +GADAGGGLFQAVSSAFRRPHC +>CALJE_DJ01Gene19453 +MITGKDIYDVLAAIVPLYVAMILAYGSVRWWKIFTPDQCSGINRFVAVFAVPLLSFHFIS +TNNPYAMNYHFIGADSLQKVVILFALFLWHNLSKRGNLDWTITLFSLSTLPNTLVMGIPL +LRAMYGDFSGSLMVQIVVLQSVIWYTLMLFLFEYRGAKALISEQFPPDIAGSITSFRVDS +DVVSLNGREPLQADAEIRQDGKLHVVVRRSTSSAARSMSSSYNKSHGLNSITSMTPRASN +LTGVEIYSLQSSREPTPRASSFNQTDFYAMFSSKVTSPRPDPSKPALHQDIPAPKGLHAP +SGNASPIRKAGTNGDLEIEDGCKSQEGKFPASPFVAQKKGTDTGGVAGLVENNHRMPPAS +VMTRLILIMVWRKLIRNPNTYSSLLGLVWSLVSFRWNIEMPTIIKGSISILSDAGLGMAM +FSLGLFMALQPKIIACGKSVAAFSMAVRFLTGPAVIAATSIAIGVRGVLLHVAIVQAALP +QGIVPFVFAKEYNCHPDILSTAVIFGMLIALPITILYYVLLGV +>CALJE_DJ01Gene20884 +MIGWEDVCKVVASMVPLYVALGLGYGSVRWWHVFTPDQCDAVNRLVFSFTLPFYAFEFAI +HADPFSMNCRLIAADIIGKLIVILVLSLWAKCREGSHRCSWFITAFSLSTLNNSLVLGLP +LLTSLYGPSVRGLVVQTTVMQAIIWLTLLLFMLEIKKAKGILLEESPMKEERSWPSFWCL +MRMVWLKLALNPNFYASILGITWAFIANRWQLEMPSIMEGSVLVISRAGTGMAMFCIGLF +MALQKKMLACGARLTALALVLRFVVGPATMAISAFAVGLHGDVLRLAIIQAALPQSVTSF +IFAREYGLHADVLSTAVILGLLVCLPVLVAYNVLLGFVT diff -r 8e649f27aa0d -r 1233363389c1 test-data/mafft_amino_withU.aln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/mafft_amino_withU.aln Wed Mar 05 16:46:36 2025 +0000 @@ -0,0 +1,96 @@ +>CALJE_DJ01Gene08198 +MDRVKNQNE---------------------DLLSGVVPLMKLLCLTVIGLVLAHPKIQ-- +-IVPRATFKLLSKLVFALFLPCLIF--VHLGESVTLNSVLLWWFVPVNVLISTAIG---- +-CALGYIVAIICRPPPQFYRFAVIMTGFG-----NTGNLPIAIVGSVCHSSENPFGPDCH +RTGVAYVSFAQWVAVILVYTLVYHMME------------PPMQYYEIVSEENEIQEETVN +NISRPLLHEAEWPG------MVDKETVH-------------------------------- +-----------------SKTPFIARV-------FMSISG--------SSQNTFPDL---- +-------------------------------------------------DLTED------ +----GGAGPSSP-----------------------------KSLRCLAE----------- +------------------------------------------------------------ +---------PKVVRRIRIVAEETPIRHILQPPTIASLLALIVGMVPLFRDFVFGTDAPLS +FFTDSLEILAGAVVPSVMLILGGMLAEGPNDSALGTRTMIGITVARLLVLP--------- +------LVGIGVVALADKLNFLVEGDQMYRFVLLLQYTTPSAILLGAIASLRVMLSRKLR +HSCSGSTSVQUSSNSICNLLILLHSLADEDVGASQSGELIK------GTDATRHQLFPGK +DAGFAREQRHGFHAAEVFIAPC-SQKEEKMLFEARRLVRWGFHEPHGPRHAAFQPWPDLS +RARKHCLAPEAGVD---SIAKSAHRSHFSAFSPTP +>CALJE_DJ01Gene07324 +MHQKRDIDPADLWLPYSFRSSNMISLATVYHVLEATVPLY-------AAMMLAYLSIKWW +KLFTPDQCTGINKFVAKFSVPLLSFHVISTNNPYQMNLKLLFSDSMQKILALLFFAVISK +ACFRGS--------------LDWLITGFSLSTLPNTLIVGIPLLKDL-------YGDEAA +KLLGQIIV----LQSLVWYTLLLFLFEFRVAKAVAA------------------------ +------------------------------------------------------------ +-----------------NRND---------------NTG-----ELEASGGMQPKP---- +---------------------------------------------------EED--EAKT +LSM--------------------------------------RSIKSLLMKSL-------- +------------------------------------------------------------ +-----------------LILCMVGKKLMINPNTYASLAGFVWALIS----FRWGIELP-L +MIRSCISILSDGGLGMAMFSLGLFTASQSSIIACGTRMMVLSMGLRFIVGPALIAIPSYA +IGMRATLLKVAIVQAA-----LPQG--IVPWVFAKEYGVQPDIL---------------- +-----STGVII-------------------------GMIIA------------------- +-------------------VPI-------------------------------------- +-----------------ALAYYSILDHN------- +>CALJE_DJ01Gene04286 +----------------------MITWHDLYTVLTAVVPLY-------VAMILAYGSVRWW +RIFSPDQCSGINRFVAIFAVPLLSFHFISTNNPYTMNFRFIAADTLQKLIVLSALAAWAR +LSSRGS--------------LDWAITVFSLATLPNTLVMGIPLLIAM-------YGSFSG +SLMVQIVV----LQCIIWYTLLLFLFEYRAARLLIADQF-PDTAASIVSFRVDSDVVSLD +GGRDLLQADAEVGGDGKIHVTVRRSNAS-RRSVS------------MAMTPRPSNLTGAE +IYSLSSSRNPTPRGSNFNHSDFFAMVGGAPPPLRPSNFGPADLYSLHSSRGPTPRPSNFD +DGAAVGSPRFVHYPAPNPEISASAPVTKKPTPTNPAPPSTAAATQQQNRAAHHD---AKE +LHMFVWSSSASPVSEVGGLHVFGGADFAAPDLAGRPDHGGAKEIRMLIPTDLPQNGGTKG +VAIPEGEDYGGGGEDFSFGGGKGLEDLVGRDKENGPEGLSKLGSSSTAELHPKGGGGPSD +GAKQAHPQMPPASVMTRLILIMVWRKLIRNPNTYSSLIGLIWSLVA----FRWHVTMP-K +IVEKSISILSDAGLGMAMFSLGLFMALQPKIIACGNSVATFAMAVRFLTGPAVMAAASIA +VGLRGVLLHVAIVQAA-----LPQG--IVPFVFAKEYNVHPAIL---------------- +-----STAVIF-------------------------GMLIA------------------- +-------------------LPI-------------------------------------- +-----------------TLVYYIILGL-------- +>CALJE_DJ01Gene08527 +----------------------MISLVIVYHVLEATVPLY-------AAMILAYLSVKWW +KLFTPDQCTGINNFVAKFSVPLLSFHVISPNNPYPINLKLLFSDSVQKILALLVFAVLSR +PCFRGS--------------LDWLITGFSTSTLPNTLIIGIPLLKGL-------YGDEAV +KLLGQIIV----LQSLVWNTLLLFLFEVRAAKAVAA------------------------ +------------------------------------------------------------ +-----------------NPTD---------------NTG-----ELESSGGIQPKP---- +---------------------------------------------------EED--EVKC +L----------------------------------------------------------- +------------------------------------------------------------ +------------------------------------LAGFIWALIL----FRWEVELP-L +IISKCISILSDGGLGMAMFSLGLFMASQSSIIASGTWMMVLSMGLRFIIGPALIAIPSYA +IGLRATLLKVAIVQAA-----LPQG--IVPFVFAKEYSVHPDIL---------------- +-----STGFKLD-----------------------QGFLLADERAIEKIDAVELRENPDN +EMGRSPESRR----KGAVIVPIISD----------------------------------- +-----AIGADAGGGLFQAVSSAFRRPHC------- +>CALJE_DJ01Gene19453 +----------------------MITGKDIYDVLAAIVPLY-------VAMILAYGSVRWW +KIFTPDQCSGINRFVAVFAVPLLSFHFISTNNPYAMNYHFIGADSLQKVVILFALFLWHN +LSKRGN--------------LDWTITLFSLSTLPNTLVMGIPLLRAM-------YGDFSG +SLMVQIVV----LQSVIWYTLMLFLFEYRGAKALISEQFPPDIAGSITSFRVDSDVVSLN +-GREPLQADAEIRQDGKLHVVVRRSTSSAARSMSSSYNKSHGLNSITSMTPRASNLTGVE +IYSLQSSREPTPRASSFNQTDFYAMF---------------------SSKVTSPRP---- +---------------------------------DPSKP-----------ALHQDIPAPKG +LH--APSGNASPIRKAG-----TNGDLEIED--------GCKSQEGKFP-------ASPF +VAQKKGTDTGGVA----------------------------------------------- +GLVENNHRMPPASVMTRLILIMVWRKLIRNPNTYSSLLGLVWSLVS----FRWNIEMP-T +IIKGSISILSDAGLGMAMFSLGLFMALQPKIIACGKSVAAFSMAVRFLTGPAVIAATSIA +IGVRGVLLHVAIVQAA-----LPQG--IVPFVFAKEYNCHPDIL---------------- +-----STAVIF-------------------------GMLIA------------------- +-------------------LPI-------------------------------------- +-----------------TILYYVLLGV-------- +>CALJE_DJ01Gene20884 +----------------------MIGWEDVCKVVASMVPLY-------VALGLGYGSVRWW +HVFTPDQCDAVNRLVFSFTLPFYAFEFAIHADPFSMNCRLIAADIIGKLIVILVLSLWAK +-CREGSH------------RCSWFITAFSLSTLNNSLVLGLPLLTSL-------YGPSVR +GLVVQTTV----MQAIIWLTLLLFMLEIKKAKGILLEE---------------------- +------------------------------------------------------------ +----------------------------------------------------SPMK---- +---------------------------------------------------EER------ +---------SWP------------------------------------------------ +----------------SFW----------------------------------------- +-----------------CLMRMVWLKLALNPNFYASILGITWAFIA----NRWQLEMP-S +IMEGSVLVISRAGTGMAMFCIGLFMALQKKMLACGARLTALALVLRFVVGPATMAISAFA +VGLHGDVLRLAIIQAA-----LPQS--VTSFIFAREYGLHADVL---------------- +-----STAVIL-------------------------GLLVC------------------- +-------------------LPV-------------------------------------- +-----------------LVAYNVLLGFVT------