diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 6f817fcb..ea8d7f30 100644 --- 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 index 94c77044..d7ef1379 100644 --- a/rescript/ncbi_datasets.py +++ b/rescript/ncbi_datasets.py @@ -21,7 +21,7 @@ from multiprocessing import Manager from ncbi.datasets import ApiException from q2_types.feature_data import DNAFASTAFormat -from q2_types_genomics.genome_data import (LociDirectoryFormat, +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 index 4ade7cd9..469cd351 100644 --- 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 index 4e6d43ce..35e20138 100644 --- a/rescript/tests/test_ncbi_datasets.py +++ b/rescript/tests/test_ncbi_datasets.py @@ -13,7 +13,7 @@ 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, +from q2_types.genome_data import (LociDirectoryFormat, ProteinsDirectoryFormat) from qiime2.plugin.testing import TestPluginBase from rescript.ncbi import _default_ranks