Merge branch 'master' into trim-align-threads

bokulich-lab · Feb 21, 2024 · d7e99cd · d7e99cd
2 parents 3b534d9 + 6c92af9
commit d7e99cd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -26,7 +26,6 @@ requirements:
     - scikit-learn {{ scikit_learn }}
     - scikit-bio {{ scikit_bio }}
     - q2-types {{ qiime2_epoch }}.*
-    - q2-types-genomics >2023.2
     - q2-feature-classifier {{ qiime2_epoch }}.*
     - qiime2 {{ qiime2_epoch }}.*
 

diff --git a/rescript/ncbi_datasets.py b/rescript/ncbi_datasets.py
@@ -21,8 +21,8 @@
 from multiprocessing import Manager
 from ncbi.datasets import ApiException
 from q2_types.feature_data import DNAFASTAFormat
-from q2_types_genomics.genome_data import (LociDirectoryFormat,
-                                           ProteinsDirectoryFormat)
+from q2_types.genome_data import (LociDirectoryFormat,
+                                  ProteinsDirectoryFormat)
 
 from rescript.ncbi import get_taxonomies, _default_ranks
 

diff --git a/rescript/plugin_setup.py b/rescript/plugin_setup.py
@@ -8,7 +8,7 @@
 
 import importlib
 
-from q2_types_genomics.genome_data import GenomeData, Loci, Proteins
+from q2_types.genome_data import GenomeData, Loci, Proteins
 from qiime2.core.type import TypeMatch
 from qiime2.plugin import (Str, Plugin, Choices, List, Citations, Range, Int,
                            Float, Visualization, Bool, TypeMap, Metadata,

diff --git a/rescript/tests/test_ncbi_datasets.py b/rescript/tests/test_ncbi_datasets.py
@@ -13,8 +13,8 @@
 import pandas as pd
 from ncbi.datasets import GenomeApi, ApiClient, ApiException
 from q2_types.feature_data import DNAFASTAFormat
-from q2_types_genomics.genome_data import (LociDirectoryFormat,
-                                           ProteinsDirectoryFormat)
+from q2_types.genome_data import (LociDirectoryFormat,
+                                  ProteinsDirectoryFormat)
 from qiime2.plugin.testing import TestPluginBase
 from rescript.ncbi import _default_ranks
 from rescript.ncbi_datasets import (_get_assembly_descriptors,