From 5d9db30bd18789961f4ed9671877e064105e0ed8 Mon Sep 17 00:00:00 2001 From: RZ9082 Date: Fri, 27 Sep 2024 16:58:26 +0200 Subject: [PATCH 1/6] add new DBs --- .../data_manager_fetch_mapseq_db.py | 26 +++++++++++++------ .../data_manager/macros.xml | 2 +- .../data_manager/mapseq_db_fetcher.xml | 16 ++++++++---- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py b/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py index e49cb58ae11..3b88e1efbe2 100644 --- a/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py +++ b/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py @@ -10,18 +10,28 @@ import wget DB_paths = { - "mgnify_lsu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/silva_lsu-20200130.tar.gz", - "mgnify_ssu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/silva_ssu-20200130.tar.gz", - "mgnify_its_unite": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/UNITE-20200214.tar.gz", - "mgnify_its_itsonedb": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/ITSoneDB-20200214.tar.gz", + "mgnify_v5_lsu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/silva_lsu-20200130.tar.gz", + "mgnify_v5_ssu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/silva_ssu-20200130.tar.gz", + "mgnify_v5_its_unite": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/UNITE-20200214.tar.gz", + "mgnify_v5_its_itsonedb": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/ITSoneDB-20200214.tar.gz", + "mgnify_v6_lsu":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-lsu/silva-lsu_138.1.tar.gz", + "mgnify_v6_ssu":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-ssu/silva-ssu_138.1.tar.gz", + "mgnify_v6_its_unite":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/unite/unite_9.0.tar.gz", + "mgnify_v6_its_itsonedb":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/itsonedb/itsonedb_1.141.tar.gz", + "mgnify_v6_pr2":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/pr2/pr2_5.0.0.tar.gz", "test_lsu": "https://zenodo.org/record/8205348/files/test_lsu.tar.gz", } DB_names = { - "mgnify_lsu": "MGnify LSU (v5.0.7) - silva_lsu-20200130", - "mgnify_ssu": "MGnify SSU (v5.0.7) - silva_ssu-20200130", - "mgnify_its_unite": "MGnify ITS UNITE (v5.0.7) - UNITE-20200214", - "mgnify_its_itsonedb": "MGnify ITS ITSonedb (v5.0.7) - ITSoneDB-20200214", + "mgnify_v5_lsu": "MGnify LSU (v5.0.7) - silva_lsu-20200130", + "mgnify_v5_ssu": "MGnify SSU (v5.0.7) - silva_ssu-20200130", + "mgnify_v5_its_unite": "MGnify ITS UNITE (v5.0.7) - UNITE-20200214", + "mgnify_v5_its_itsonedb": "MGnify ITS ITSonedb (v5.0.7) - ITSoneDB-20200214", + "mgnify_v6_lsu":"MGnify LSU (v6.0) - silva_lsu-20240702", + "mgnify_v6_ssu":"MGnify SSU (v6.0) - silva_ssu-20240701", + "mgnify_v6_its_unite":"MGnify ITS UNITE (v6.0) - UNITE-20240702", + "mgnify_v6_its_itsonedb":"MGnify ITS ITSonedb (v6.0) - ITSoneDB-20240702", + "mgnify_v6_pr2":"MGnify PR2 (v6.0) - PR2-20240702", "test_lsu": "Trimmed LSU Test DB", } diff --git a/data_managers/data_manager_mapseq/data_manager/macros.xml b/data_managers/data_manager_mapseq/data_manager/macros.xml index e52e07abecd..4cbc7e347a8 100644 --- a/data_managers/data_manager_mapseq/data_manager/macros.xml +++ b/data_managers/data_manager_mapseq/data_manager/macros.xml @@ -1,7 +1,7 @@ 1.1 - 0 + 1 22.05 diff --git a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml index 3143745ab45..5ac2e036267 100644 --- a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml +++ b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml @@ -20,14 +20,20 @@ - - - - + + + + + + + + + - + + From 79815997bc798a77716d5f18b34ffef5f0757385 Mon Sep 17 00:00:00 2001 From: RZ9082 Date: Fri, 27 Sep 2024 17:04:19 +0200 Subject: [PATCH 2/6] flake8 --- .../data_manager_fetch_mapseq_db.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py b/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py index 3b88e1efbe2..6c1d5c41517 100644 --- a/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py +++ b/data_managers/data_manager_mapseq/data_manager/data_manager_fetch_mapseq_db.py @@ -14,11 +14,11 @@ "mgnify_v5_ssu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/silva_ssu-20200130.tar.gz", "mgnify_v5_its_unite": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/UNITE-20200214.tar.gz", "mgnify_v5_its_itsonedb": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipeline-5.0/ref-dbs/ITSoneDB-20200214.tar.gz", - "mgnify_v6_lsu":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-lsu/silva-lsu_138.1.tar.gz", - "mgnify_v6_ssu":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-ssu/silva-ssu_138.1.tar.gz", - "mgnify_v6_its_unite":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/unite/unite_9.0.tar.gz", - "mgnify_v6_its_itsonedb":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/itsonedb/itsonedb_1.141.tar.gz", - "mgnify_v6_pr2":"ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/pr2/pr2_5.0.0.tar.gz", + "mgnify_v6_lsu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-lsu/silva-lsu_138.1.tar.gz", + "mgnify_v6_ssu": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/silva-ssu/silva-ssu_138.1.tar.gz", + "mgnify_v6_its_unite": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/unite/unite_9.0.tar.gz", + "mgnify_v6_its_itsonedb": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/itsonedb/itsonedb_1.141.tar.gz", + "mgnify_v6_pr2": "ftp://ftp.ebi.ac.uk/pub/databases/metagenomics/pipelines/tool-dbs/pr2/pr2_5.0.0.tar.gz", "test_lsu": "https://zenodo.org/record/8205348/files/test_lsu.tar.gz", } @@ -27,11 +27,11 @@ "mgnify_v5_ssu": "MGnify SSU (v5.0.7) - silva_ssu-20200130", "mgnify_v5_its_unite": "MGnify ITS UNITE (v5.0.7) - UNITE-20200214", "mgnify_v5_its_itsonedb": "MGnify ITS ITSonedb (v5.0.7) - ITSoneDB-20200214", - "mgnify_v6_lsu":"MGnify LSU (v6.0) - silva_lsu-20240702", - "mgnify_v6_ssu":"MGnify SSU (v6.0) - silva_ssu-20240701", - "mgnify_v6_its_unite":"MGnify ITS UNITE (v6.0) - UNITE-20240702", - "mgnify_v6_its_itsonedb":"MGnify ITS ITSonedb (v6.0) - ITSoneDB-20240702", - "mgnify_v6_pr2":"MGnify PR2 (v6.0) - PR2-20240702", + "mgnify_v6_lsu": "MGnify LSU (v6.0) - silva_lsu-20240702", + "mgnify_v6_ssu": "MGnify SSU (v6.0) - silva_ssu-20240701", + "mgnify_v6_its_unite": "MGnify ITS UNITE (v6.0) - UNITE-20240702", + "mgnify_v6_its_itsonedb": "MGnify ITS ITSonedb (v6.0) - ITSoneDB-20240702", + "mgnify_v6_pr2": "MGnify PR2 (v6.0) - PR2-20240702", "test_lsu": "Trimmed LSU Test DB", } From dcd584f343e09cfbd24501d58c1e9ccc5180deb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Fri, 27 Sep 2024 20:47:13 +0200 Subject: [PATCH 3/6] Update mapseq_db_fetcher.xml --- .../data_manager/mapseq_db_fetcher.xml | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml index 5ac2e036267..8324cf9af09 100644 --- a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml +++ b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml @@ -1,4 +1,3 @@ - Fetches the DB required for mapseq @@ -16,24 +15,23 @@ ]]> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -57,4 +55,4 @@ - \ No newline at end of file + From 91db4c4a42642d287904dc708a5bd1410d9b6557 Mon Sep 17 00:00:00 2001 From: RZ9082 Date: Mon, 30 Sep 2024 10:14:50 +0200 Subject: [PATCH 4/6] update test --- .../data_manager/mapseq_db_fetcher.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml index 8324cf9af09..590ea0e87e8 100644 --- a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml +++ b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml @@ -38,16 +38,27 @@ - + - + - + + + + + + + + + + + + Downloads preformatted DBs form MGnify that can be used for mapseq. From 414458a4a5168c150f7a9bbe4676e0b691a284f6 Mon Sep 17 00:00:00 2001 From: RZ9082 Date: Mon, 30 Sep 2024 10:53:17 +0200 Subject: [PATCH 5/6] add test files --- .../data_manager_mapseq/data_manager/mapseq_db_fetcher.xml | 6 ++++-- .../LSU.fasta_trimmed.mscluster | 0 .../{mgnify_lsu => mgnify_v5_lsu}/LSU_trimmed.fasta | 0 .../{mgnify_lsu => mgnify_v5_lsu}/lsu2_trimmed.otu | 0 .../slv_lsu_filtered2_trimmed.txt | 0 .../test-data/mgnify_v6_rp2/PR2-tax_trimmed.txt | 4 ++++ .../test-data/mgnify_v6_rp2/PR2.fasta_trimmed.mscluster | 4 ++++ .../test-data/mgnify_v6_rp2/PR2_trimmed.fasta | 4 ++++ .../test-data/mgnify_v6_rp2/PR2_trimmed.otu | 4 ++++ .../data_manager_mapseq/test-data/mgnify_v6_rp2/VERSION.txt | 1 + 10 files changed, 21 insertions(+), 2 deletions(-) rename data_managers/data_manager_mapseq/test-data/{mgnify_lsu => mgnify_v5_lsu}/LSU.fasta_trimmed.mscluster (100%) rename data_managers/data_manager_mapseq/test-data/{mgnify_lsu => mgnify_v5_lsu}/LSU_trimmed.fasta (100%) rename data_managers/data_manager_mapseq/test-data/{mgnify_lsu => mgnify_v5_lsu}/lsu2_trimmed.otu (100%) rename data_managers/data_manager_mapseq/test-data/{mgnify_lsu => mgnify_v5_lsu}/slv_lsu_filtered2_trimmed.txt (100%) create mode 100644 data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2-tax_trimmed.txt create mode 100644 data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2.fasta_trimmed.mscluster create mode 100644 data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.fasta create mode 100644 data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.otu create mode 100644 data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/VERSION.txt diff --git a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml index 590ea0e87e8..800fd115f49 100644 --- a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml +++ b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml @@ -11,12 +11,14 @@ --out '${out_file}' --version '${version}' --database-type '${database_type}' - $test_data_manager + $test_data_manager_v5 + $test_data_manager_v6 ]]> - + + diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_lsu/LSU.fasta_trimmed.mscluster b/data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/LSU.fasta_trimmed.mscluster similarity index 100% rename from data_managers/data_manager_mapseq/test-data/mgnify_lsu/LSU.fasta_trimmed.mscluster rename to data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/LSU.fasta_trimmed.mscluster diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_lsu/LSU_trimmed.fasta b/data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/LSU_trimmed.fasta similarity index 100% rename from data_managers/data_manager_mapseq/test-data/mgnify_lsu/LSU_trimmed.fasta rename to data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/LSU_trimmed.fasta diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_lsu/lsu2_trimmed.otu b/data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/lsu2_trimmed.otu similarity index 100% rename from data_managers/data_manager_mapseq/test-data/mgnify_lsu/lsu2_trimmed.otu rename to data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/lsu2_trimmed.otu diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_lsu/slv_lsu_filtered2_trimmed.txt b/data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/slv_lsu_filtered2_trimmed.txt similarity index 100% rename from data_managers/data_manager_mapseq/test-data/mgnify_lsu/slv_lsu_filtered2_trimmed.txt rename to data_managers/data_manager_mapseq/test-data/mgnify_v5_lsu/slv_lsu_filtered2_trimmed.txt diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2-tax_trimmed.txt b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2-tax_trimmed.txt new file mode 100644 index 00000000000..a34183b1e48 --- /dev/null +++ b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2-tax_trimmed.txt @@ -0,0 +1,4 @@ +#cutoff: 0.00:0.08 0.00:0.08 0.70:0.35 0.70:0.35 0.70:0.35 0.70:0.35 0.80:0.25 0.92:0.08 0.95:0.05 +#levels: Domain Supergroup Division Subdivision Class Order Family Genus Species +#name: PR2 +AB353770.1.1740_U d__Eukaryota;sg__TSAR;dv__Alveolata;sdv__Dinoflagellata;c__Dinophyceae;o__Peridiniales;f__Kryptoperidiniaceae;g__Unruhdinium;s__Unruhdinium_kevei diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2.fasta_trimmed.mscluster b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2.fasta_trimmed.mscluster new file mode 100644 index 00000000000..5570450fe68 --- /dev/null +++ b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2.fasta_trimmed.mscluster @@ -0,0 +1,4 @@ +0 205465 754 1665 1981 2573 3170 3779 4152 4355 5272 5330 5671 5784 5995 7470 8458 9336 9837 10543 11522 11752 12319 12385 13481 13623 14541 14768 14900 14931 14980 15260 15638 15912 16277 17330 18346 20015 20711 20923 21192 21315 22226 22801 23067 23263 23279 24044 24657 24805 24900 25005 26884 27112 27561 28308 29356 29423 30139 30945 31003 31340 31521 31593 31806 32167 34340 34468 35422 36425 36880 37494 38725 38860 40286 40653 41017 41106 42490 43211 43978 44665 45224 46502 47029 48371 48595 49510 50779 50784 51352 51601 51725 52244 52603 52607 53194 53358 53577 54672 54827 55196 55365 56745 57336 57724 57846 59382 59741 60962 61637 62141 62297 62324 62659 62739 62821 64686 66855 67304 67441 67855 68091 68461 68742 70749 71830 72309 72709 73032 74387 74617 74624 77802 77930 78279 79272 80603 81428 82088 82315 83571 84447 85181 85823 86779 87089 89391 90298 91045 91093 93794 95095 96213 97223 98014 98191 98387 99054 99264 100023 100068 101545 101839 102733 103364 103377 103977 104183 104390 104785 106726 106834 107030 107388 108179 108270 108598 108630 109203 110648 110981 111132 111595 111976 111992 112242 112657 114625 118148 118635 119238 119586 120826 121873 122186 124026 124492 125746 126825 126862 126867 128172 128242 128840 129005 129056 129500 130486 130504 131255 131356 131858 132159 132779 133202 134013 134339 135658 135727 135859 137532 138968 139782 139925 141250 141654 141661 145922 147008 149592 150200 150201 150202 150203 150204 150205 150206 150207 151737 151767 151781 151812 151814 151842 151845 151850 151881 151885 151964 151970 151975 151989 151996 152019 152039 152055 152068 152094 152105 152193 152207 152216 152226 152296 152307 152314 152339 152340 152361 154570 158485 158489 181294 181295 181297 181300 181301 181303 181308 181309 181310 181311 181312 181313 181314 181315 181316 181317 181319 181320 181322 181324 181325 181326 181327 181328 181329 181330 181359 181360 181361 181362 181363 181364 181365 181366 181367 181368 181369 181370 181371 181372 181373 181374 181375 181376 181377 181378 181379 181380 181381 181382 181383 181392 181586 184844 185293 197488 198891 198894 205167 205168 205179 205184 205191 205192 216479 216510 216971 216990 +1 6400 1130 2149 27364 44735 50750 58365 110841 204950 204951 204952 204953 204954 204955 +2 111578 98334 +3 30450 30452 diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.fasta b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.fasta new file mode 100644 index 00000000000..faa7756956e --- /dev/null +++ b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.fasta @@ -0,0 +1,4 @@ +>AB353770.1.1740_U +ATGCTTGTCTCAAAGATTAAGCCATGCATGTCTCAGTATAAGCTTTTACATGGCGAAACTGCGAATGGCTCATTAAAACAGTTACAGTTTATTTGAAGGTCATTTTCTACATGGATAACTGTGGTAATTCTAGAGCTAATACATGCGCCCAAACCCGACTCCGTGGAAGGGTTGTATTTATTAGTTACAGAACCAACCCAGGTTCGCCTGGCCATTTGGTGATTCATAATAAACGAGCGAATTGCACAGCCTCAGCTGGCGATGTATCATTCAAGTTTCTGACCTATCAGCTTCCGACGGTAGGGTATTGGCCTACCGTGGCAATGACGGGTAACGGAGAATTAGGGTTCGATTCCGGAGAGGGAGCCTGAGAAACGGCTACCACATCTAAGGAAGGCAGCAGGCGCGCAAATTACCCAATCCTGACACAGGGAGGTAGTGACAAGAAATAACAATACAGGGCAACCATGTCTTGTAATTGGAATGAGTAGAATTTAAATCCCTTTACGAGTATCCATTGGAGGGCAAGTCTGGTGCCAGCAGCCGCGGTAATTCCAGCTCCAATAGCGTATATTAAAGTTGTTGCGGTTAAAAAGCTCGTAGTTGGATTTCTGTCGAAGGAGACCGGTCCGCCCTCTGGGTGAGTATCTGGATCTCTTTGGACATCTTCTTGGGGAACGTATCTGCACTTCATTGTGCGGTGCGGTACTCAAGACTTTTACTTTGAGGAAATTAGAGTGTTTCAAGCAGGCACACGCCTTGAATACATTAGCATGGAATAATAAGATAGGACCTCGGTTCTATTTTGTTGGTTTCTAGAGCTGAGGTAATGATTAATAGGGATAGTTGGGGGCATTCGTATTTAACTGTCAGAGGTGAAATTCTTGGATTTGTTAAAGACGGACTACTGCGAAAGCATTTGCCAAGGATGTTTTCATTGATCAAGAACGAAAGTTAGGGGATCGAAGACGATCAGATACCGTCGTAGTCTTAACCATAAACCATGCCGACTAGAGATTGGAGGTCGTTATCCGTACGACTCCTTCAGCACCTTATGAGAAATCAAAGTCTTTGGGTTCCGGGGGGAGTATGGTCGCAAGGCTGAAACTTAAAGGAATTGACGGAAGGGCACCACCAGGAGTGGAGCCTGCGGCTTAATTTGACTCAACACGGGGAAACTTACCAGGTCCAGACATAGTAAGGATTGACAGATTGATAGCTCTTTCTTGATTCTATGGGTGGTGGTGCATGGCCGTTCTTAGTTGGTGGAGTGATTTGTCTGGTTAATTCCGTTAACGAACGAGACCTTAACCTGCTAAATAGTGACACATTACCCCGGTAATGTGGGTTACTTCTTAGAGGGACTTTGCGTGTCTAACGCAAGGAAGTTTGAGGCAATAACAGGTCTGTGATGCCCTTAGATGTTCTGGGCTGCACGCGCGCTACACTGATGCGCTCAACGAGTTTATGACCTTGCCCGGAAGGGTTGGGTAATCTTGTTAAAACGCATCGTGATGGGGATAGATTATTGCAATTATTAATCTTCAACGAGGAATTCCTAGTAAGCGCGAGTCATCAGCTCGTGCTGATTAAGTCCCTGCCCTTTGTACACACCGCCCGTCGCTCCTACCGATTGAGTGATCCGGTGAATAATTCGGACCGCAGCATTTGTCAGTTCCTGACTCATGCCGTGGAAAGTCTAGTGAACCTTATCACTTAGAGGAAGGAGAAGTCGTAACA +>AB284159.1.1765_U +TGATCCTGCCAGTAGTCATATGCTTGTCTCAAAGATTAAGCCATGCATGTCTCAGTATAAGCTTCAACATGGCAAGACTGTGAATGGCTCATTAAAACAGTTGTAGTTTATTTGGTGGCCTCTTTACATGGATAGCCGTGGTAATTCTAGAACTAATACATGCGCTCAAGCCCGACTTCGCAGAAGGGCTGTGTTTATTTGTTACAGAACCATTTCAGGCTCTGCCTGGTTTTTGGTGAATCAAAATACCTTATGGATTGTGTGGCATCAGCTGGTGATGACTCATTCAAGCTTCTGACCTATCAGCTTCCGACGGTAGGGTATTGGCCTACCCTGGCAATGACGGGTAACGGAGAATTAGGGTTTGATACCGGAGAGGGAGCCTGAGAAACGGCTACCACATCTAAGGAAGGCAGCAGGCGCGCAAATTACCCAATCCTGACACAGAGAGGTAGTGACAAGAAATAACAATACAGGGCATCCATGTCTTGTAATTGGAATGAATAGAATGTATACCCTTTTATGAGTATCAATTGGAGGGCAAGTCTGGTGCCAGCAGCCGCGGTAATTCCAGCTCCAATAGTGTATATTAAAGTTGTTGCGGTTAAAAAGCTCGTAGTTGGATTTCTGCCAAGGCTGACCGGTCCGCCCTTTGGGTGAGTATCTGGCTTGGCTGGAGCATTTTCTTGGAGGGCATGGCTGCACTTAACTGTGTGGTATGCAACCCAAGACTTTTACTTTGAGGAAATTAGAGTGTCTCAAGCAGGCTCGCGCCTTGAATACATTAGCATGGAATAATAAGATAAGGCCTTGGTTGTATTTTGTTGGTTTCTACAGCTGAGGTAATGATGAACAGGGATACTTGGGGGCATACGAATTTAACTGTCAGAGGTGAAATTCTTGGATTTGTTAAAGACGGACTACTGTGAAAGCATTTGCCAAGAATGTTTTCATTGATCAAGAATGAAAGTTAGGGGGTCGAAGATGATCAGATACCGTCTTAGTCTTAACCATAAACTATGCCGACTAGAGATTGGAGGTTGCTACTTACATGACTCCTTCAGCACCTTATGGGAAATCAAAGTCTTTGGGTTCCGGGGGGAGTATGGTTGCAAGGCTGAAACTTAAAGGAATTGACGGAAGGGCACCACCAGTAGTGGAGCCTGCGGCTTAATTTGACTCAACACGGGGAAACTTACCAGGTCCAGACATAGTAAGGATTGACAGATTGATAGCTCCTTCTTGATTCTGTGGGTGGTGGTGCATGGCCGTTCTTAGTTGGTGGAGTGATTTGTCTGGTTAATTCCGTTAACGAACGAGACCTTATCCTGCTAAATAGATTCGCATAGCCATGGTTATGTGGGGAACTTCTTAGAGGAACTTTGTGTGTCTAATGCAAGGAAGTTTGAGGCAATAACAGGTCTGTGATGCCCTTAGATGTTCTGGGCTGCACGCGCGCTACACTGATGAGCTCAACAAGTGTGCAACTTTGCCTGAAAAGGTAGGGCAATCTTTTGAAAACGTATCATGATGGGGATCGATTATTGCAATTATTAGTCTTCAACAAGGAATTCCTAGTAAGTGTGAGTCATCAACTTATGCTGATTACGTCCCTGCCCTTTGTACACACCGCCCGTCGCTCCTACTGATTGAGTGATCCGGTGAATATTTTGGACTGCAGCATAGCTTAGTTCCTGAGTGTTGCAGCATAAAGTTTAGTGAACCTTATCACTTAGAGGAAGGAGAAGTCGTAACAAGGTTTCCG diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.otu b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.otu new file mode 100644 index 00000000000..ba2113d58bd --- /dev/null +++ b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/PR2_trimmed.otu @@ -0,0 +1,4 @@ +1 Unclassified +2 d__Archaea +3 d__Archaea;sg__DPANN +4 d__Archaea;sg__DPANN;dv__Nanoarchaeaeota diff --git a/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/VERSION.txt b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/VERSION.txt new file mode 100644 index 00000000000..0062ac97180 --- /dev/null +++ b/data_managers/data_manager_mapseq/test-data/mgnify_v6_rp2/VERSION.txt @@ -0,0 +1 @@ +5.0.0 From f5b416a06ceb518aa4e690e1c34d32f7ec9b502b Mon Sep 17 00:00:00 2001 From: RZ9082 Date: Mon, 30 Sep 2024 11:17:07 +0200 Subject: [PATCH 6/6] fix indentation --- .../data_manager/mapseq_db_fetcher.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml index 800fd115f49..0bfaa71bd77 100644 --- a/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml +++ b/data_managers/data_manager_mapseq/data_manager/mapseq_db_fetcher.xml @@ -44,10 +44,10 @@ - - - - + + + + @@ -55,10 +55,10 @@ - - - - + + + +