Merge branch 'master' into min-coverage

bokulich-lab · Aug 13, 2024 · 611aeda · 611aeda
2 parents aa1ef50 + 9c5c101
commit 611aeda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rescript/get_data.py b/rescript/get_data.py
@@ -20,7 +20,7 @@
 
 
 def get_silva_data(ctx,
-                   version='138.1',
+                   version='138.2',
                    target='SSURef_NR99',
                    include_species_labels=False,
                    rank_propagation=True,
@@ -86,7 +86,7 @@ def _assemble_silva_data_urls(version, target, download_sequences=True):
     tax_url = base_url_tax + '.txt'
 
     # add ".gz" for the following versions:
-    if version in ['138', '138.1']:
+    if version in ['138', '138.1', '138.2']:
         tree_url += '.gz'
         tax_url += '.gz'
 

diff --git a/rescript/plugin_setup.py b/rescript/plugin_setup.py
@@ -729,15 +729,15 @@
                     "[default: '" +
                     "', '".join(DEFAULT_RANKS) + "']")
 
-_SILVA_VERSIONS = ['128', '132', '138', '138.1']
+_SILVA_VERSIONS = ['128', '132', '138', '138.1', '138.2']
 _SILVA_TARGETS = ['SSURef_NR99', 'SSURef', 'LSURef_NR99', 'LSURef']
 
 version_map, target_map, _ = TypeMap({
     (Str % Choices('128', '132'),
      Str % Choices('SSURef_NR99', 'SSURef', 'LSURef')): Visualization,
     (Str % Choices('138'),
      Str % Choices('SSURef_NR99', 'SSURef')): Visualization,
-    (Str % Choices('138.1'),
+    (Str % Choices('138.1', '138.2'),
      Str % Choices('SSURef_NR99', 'SSURef', 'LSURef_NR99',
                    'LSURef')): Visualization,
 })