# HG changeset patch
# User iuc
# Date 1575397840 0
# Node ID 8ddbdc9cdc572aa45976c7c180276c2a6f421276
# Parent 196f2cf1f0a1e319799f8132e179db59156af94c
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/blob/master/tool_collections/kraken/ commit 1590e274eaa41ea77a6017111f9122e0a58aa75d-dirty"
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 kraken-mpa-report.xml
--- a/kraken-mpa-report.xml Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-
-
- view report of classification for multiple samples
-
- macros.xml
-
-
-
- '$output_report'
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 kraken-report.xml
--- a/kraken-report.xml Thu Sep 13 09:44:00 2018 -0400
+++ b/kraken-report.xml Tue Dec 03 18:30:40 2019 +0000
@@ -24,9 +24,9 @@
-
-
-
+
+
+
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 macros.xml
--- a/macros.xml Thu Sep 13 09:44:00 2018 -0400
+++ b/macros.xml Tue Dec 03 18:30:40 2019 +0000
@@ -1,9 +1,9 @@
- 1.2.4
+ 1.3.1
- kraken
+ kraken
@@ -23,6 +23,10 @@
10.1186/gb-2014-15-3-r46
- --db '${kraken_database.fields.name}'
- export KRAKEN_DB_PATH='${kraken_database.fields.path}'
+
+ if [ -d '${kraken_database.fields.path}/${kraken_database.fields.name}' ]; then export KRAKEN_DEFAULT_DB='${kraken_database.fields.path}/${kraken_database.fields.name}'; else export KRAKEN_DEFAULT_DB='${kraken_database.fields.path}'; fi
+ --db "\$KRAKEN_DEFAULT_DB"
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/kraken_mpa_report_input1.tab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/kraken_mpa_report_input1.tab Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,4 @@
+C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
+C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
+C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
+C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/kraken_mpa_report_input2.tab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/kraken_mpa_report_input2.tab Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,4 @@
+C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
+C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
+C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
+C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/kraken_mpa_report_test1_output.tab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/kraken_mpa_report_test1_output.tab Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,8 @@
+#Sample ID kraken_mpa_report_input1.tab kraken_mpa_report_input2.tab
+d__Bacteria 4 4
+d__Bacteria|p__Proteobacteria 4 4
+d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria 4 4
+d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales 4 4
+d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae 4 4
+d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae|g__Escherichia 4 4
+d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae|g__Escherichia|s__Escherichia_coli 4 4
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/kraken_report_test1.tab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/kraken_report_test1.tab Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,4 @@
+C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
+C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
+C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
+C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/kraken_report_test1_output.tab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/kraken_report_test1_output.tab Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,11 @@
+ 0.00 0 0 U 0 unclassified
+100.00 4 0 - 1 root
+100.00 4 0 - 131567 cellular organisms
+100.00 4 0 D 2 Bacteria
+100.00 4 0 P 1224 Proteobacteria
+100.00 4 0 C 1236 Gammaproteobacteria
+100.00 4 0 O 91347 Enterobacteriales
+100.00 4 0 F 543 Enterobacteriaceae
+100.00 4 0 G 561 Escherichia
+100.00 4 0 S 562 Escherichia coli
+100.00 4 4 - 83333 Escherichia coli K-12
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken-report/test_database.loc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kraken-report/test_database.loc Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,20 @@
+# Tab separated with three columns:
+# - value (Galaxy records this in the Galaxy DB)
+# - name (Galaxy shows this in the UI)
+# - path (folder name containing the Kraken DB)
+#
+# Modern usage assumes $path is the folder containing
+# the Kraken database of interest:
+#
+new_style_test_entry "Test Database" ${__HERE__}/test_db
+
+# The kraken wrapper still supports an alternative
+# legacy usage where $path/$name is the folder
+# containing the Kraken database of interest, meaning
+# $name must be both a folder name and human readable
+# description of the DB to show in the Galaxy UI:
+old_style_test_entry test_db ${__HERE__}
+
+# NOTE: This legacy style should be avoided as other
+# tools also using the kraken_database.loc file may
+# not understand it!
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken_mpa_report_input1.tab
--- a/test-data/kraken_mpa_report_input1.tab Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
-C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
-C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
-C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken_mpa_report_input2.tab
--- a/test-data/kraken_mpa_report_input2.tab Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
-C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
-C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
-C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken_mpa_report_test1_output.tab
--- a/test-data/kraken_mpa_report_test1_output.tab Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Sample ID kraken_mpa_report_input1.tab kraken_mpa_report_input2.tab
-d__Bacteria 4 4
-d__Bacteria|p__Proteobacteria 4 4
-d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria 4 4
-d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales 4 4
-d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae 4 4
-d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae|g__Escherichia 4 4
-d__Bacteria|p__Proteobacteria|c__Gammaproteobacteria|o__Enterobacteriales|f__Enterobacteriaceae|g__Escherichia|s__Escherichia_coli 4 4
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken_report_test1.tab
--- a/test-data/kraken_report_test1.tab Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-C gi|145231|gb|M33724.1|ECOALPHOA 83333 171 83333:162
-C gi|145232|gb|M33725.1|ECOALPHOB 83333 183 83333:174
-C gi|145234|gb|M33727.1|ECOALPHOE 83333 97 83333:88
-C gi|146195|gb|J01619.1|ECOGLTA 83333 3850 83333:3841
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/kraken_report_test1_output.tab
--- a/test-data/kraken_report_test1_output.tab Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
- 0.00 0 0 U 0 unclassified
-100.00 4 0 - 1 root
-100.00 4 0 - 131567 cellular organisms
-100.00 4 0 D 2 Bacteria
-100.00 4 0 P 1224 Proteobacteria
-100.00 4 0 C 1236 Gammaproteobacteria
-100.00 4 0 O 91347 Enterobacteriales
-100.00 4 0 F 543 Enterobacteriaceae
-100.00 4 0 G 561 Escherichia
-100.00 4 0 S 562 Escherichia coli
-100.00 4 4 - 83333 Escherichia coli K-12
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/test_database.loc
--- a/test-data/test_database.loc Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-test_db test_db ${__HERE__}
\ No newline at end of file
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/test_db/database.idx
Binary file test-data/test_db/database.idx has changed
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/test_db/database.kdb
Binary file test-data/test_db/database.kdb has changed
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/test_db/taxonomy/names.dmp
--- a/test-data/test_db/taxonomy/names.dmp Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-83333 | Escherichia coli K-12 | | scientific name |
-83333 | Escherichia coli K12 | | equivalent name |
-562 | "Bacillus coli" Migula 1895 | | authority |
-562 | "Bacterium coli commune" Escherich 1885 | | authority |
-562 | "Bacterium coli" (Migula 1895) Lehmann and Neumann 1896 | | authority |
-562 | ATCC 11775 | | type material |
-562 | Bacillus coli | | synonym |
-562 | Bacterium coli | | synonym |
-562 | Bacterium coli commune | | synonym |
-562 | CCUG 24 | | type material |
-562 | CCUG 29300 | | type material |
-562 | CIP 54.8 | | type material |
-562 | DSM 30083 | | type material |
-562 | Enterococcus coli | | synonym |
-562 | Escherchia coli | | misspelling |
-562 | Escherichia coli | | scientific name |
-562 | Escherichia coli (Migula 1895) Castellani and Chalmers 1919 | | authority |
-562 | Escherichia sp. MAR | | includes |
-562 | Escherichia/Shigella coli | | equivalent name |
-562 | Eschericia coli | | misspelling |
-562 | JCM 1649 | | type material |
-562 | LMG 2092 | | type material |
-562 | NBRC 102203 | | type material |
-562 | NCCB 54008 | | type material |
-562 | NCTC 9001 | | type material |
-562 | bacterium 10a | | includes |
-562 | bacterium E3 | | includes |
-561 | Escherchia | | misspelling |
-561 | Escherichia | | scientific name |
-561 | Escherichia Castellani and Chalmers 1919 | | authority |
-543 | Enterobacteraceae | | synonym |
-543 | Enterobacteraceae (ex Lapage 1979) Lapage 1982, fam. nov., nom. rev. | | synonym |
-543 | Enterobacteriaceae | | scientific name |
-543 | Enterobacteriaceae (ex Rahn 1937) Ewing et al. 1980, fam. nov., nom. rev. | | synonym |
-543 | Enterobacteriaceae Rahn 1937 | | synonym |
-543 | gamma-3 proteobacteria | gamma-3 proteobacteria <#1> | in-part |
-91347 | 'Enterobacteriales' | | synonym |
-91347 | Enterobacteriaceae and related endosymbionts | | synonym |
-91347 | Enterobacteriaceae group | | synonym |
-91347 | Enterobacteriales | | scientific name |
-91347 | enterobacteria | enterobacteria | blast name |
-91347 | gamma-3 proteobacteria | gamma-3 proteobacteria <#5> | in-part |
-1236 | Gammaproteobacteria | | scientific name |
-1236 | Gammaproteobacteria Garrity et al. 2005 | | synonym |
-1236 | Proteobacteria gamma subdivision | | synonym |
-1236 | Purple bacteria, gamma subdivision | | synonym |
-1236 | g-proteobacteria | gamma proteos | blast name |
-1236 | gamma proteobacteria | | synonym |
-1236 | gamma subdivision | | synonym |
-1236 | gamma subgroup | | synonym |
-1224 | Proteobacteria | | scientific name |
-1224 | Proteobacteria Garrity et al. 2005 | | authority |
-1224 | Proteobacteria [class] Stackebrandt et al. 1988 | | authority |
-1224 | not Proteobacteria Cavalier-Smith 2002 | | authority |
-1224 | proteobacteria | proteobacteria | blast name |
-1224 | purple bacteria | | common name |
-1224 | purple bacteria and relatives | | common name |
-1224 | purple non-sulfur bacteria | | common name |
-1224 | purple photosynthetic bacteria | | common name |
-1224 | purple photosynthetic bacteria and relatives | | common name |
-2 | Bacteria | Bacteria | scientific name |
-2 | Monera | Monera | in-part |
-2 | Procaryotae | Procaryotae | in-part |
-2 | Prokaryota | Prokaryota | in-part |
-2 | Prokaryotae | Prokaryotae | in-part |
-2 | bacteria | bacteria | blast name |
-2 | eubacteria | | genbank common name |
-2 | not Bacteria Haeckel 1894 | | synonym |
-2 | prokaryote | prokaryote | in-part |
-2 | prokaryotes | prokaryotes | in-part |
-1 | all | | synonym |
-1 | root | | scientific name |
-131567 | biota | | synonym |
-131567 | cellular organisms | | scientific name |
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 test-data/test_db/taxonomy/nodes.dmp
--- a/test-data/test_db/taxonomy/nodes.dmp Thu Sep 13 09:44:00 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-83333 | 562 | no rank | | 0 | 1 | 11 | 1 | 0 | 1 | 1 | 0 | |
-562 | 561 | species | EC | 0 | 1 | 11 | 1 | 0 | 1 | 1 | 0 | |
-561 | 543 | genus | | 0 | 1 | 11 | 1 | 0 | 1 | 0 | 0 | |
-543 | 91347 | family | | 0 | 1 | 11 | 1 | 0 | 1 | 0 | 0 | |
-91347 | 1236 | order | | 0 | 1 | 11 | 1 | 0 | 1 | 0 | 0 | |
-1236 | 1224 | class | | 0 | 1 | 11 | 1 | 0 | 1 | 0 | 0 | |
-1224 | 2 | phylum | | 0 | 1 | 11 | 1 | 0 | 1 | 0 | 0 | |
-2 | 131567 | superkingdom | | 0 | 0 | 11 | 0 | 0 | 0 | 0 | 0 | |
-131567 | 1 | no rank | | 8 | 1 | 1 | 1 | 0 | 1 | 1 | 0 | |
-1 | 1 | no rank | | 8 | 0 | 1 | 0 | 0 | 0 | 0 | 0 | |
diff -r 196f2cf1f0a1 -r 8ddbdc9cdc57 tool-data/kraken_databases.loc.sample
--- a/tool-data/kraken_databases.loc.sample Thu Sep 13 09:44:00 2018 -0400
+++ b/tool-data/kraken_databases.loc.sample Tue Dec 03 18:30:40 2019 +0000
@@ -0,0 +1,18 @@
+# Expect three columns, tab separated, as follows:
+# - value (Galaxy records this in the Galaxy DB)
+# - name (Galaxy shows this in the UI)
+# - path (folder name containing the Kraken DB)
+#
+# e.g.
+# plants2018Plant genomes (2018)/path/to/krakenDB/plants_2018
+#
+# For backward compatibility the Kraken wrapper also accepts:
+# - value (Galaxy records this in the Galaxy DB)
+# - name (Final part of folder name, Galaxy shows this in the UI)
+# - path (Parent folder name, where $path/$name contains the Kraken DB)
+#
+# e.g.
+# plants2018plants_2018/path/to/krakenDB
+#
+# Please avoid this legacy usage, as not all tools using
+# the kraken_databases.loc file will understand it.