diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index bc8e15d..3da8502 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -19,6 +19,8 @@ requirements: run: - python {{ python }} + - qiime2 {{ release }}.* + - q2-types {{ release }}.* - SHOGUN - bowtie2 - cytoolz diff --git a/q2_shogun/__init__.py b/q2_shogun/__init__.py index 14e1301..a16ad2d 100644 --- a/q2_shogun/__init__.py +++ b/q2_shogun/__init__.py @@ -7,11 +7,7 @@ # ---------------------------------------------------------------------------- from ._version import get_versions -from ._formats import (Bowtie2IndexFileFormat, Bowtie2IndexDirFmt) -from ._types import Bowtie2Index __version__ = get_versions()['version'] del get_versions - -__all__ = ['Bowtie2IndexFileFormat', 'Bowtie2IndexDirFmt', 'Bowtie2Index'] diff --git a/q2_shogun/_formats.py b/q2_shogun/_formats.py deleted file mode 100644 index 1cac54a..0000000 --- a/q2_shogun/_formats.py +++ /dev/null @@ -1,45 +0,0 @@ -# ---------------------------------------------------------------------------- -# Copyright (c) 2018-2020, QIIME 2 development team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file LICENSE, distributed with this software. -# ---------------------------------------------------------------------------- - -import itertools - -from qiime2.plugin import model - - -class Bowtie2IndexFileFormat(model.BinaryFileFormat): - def _validate_(self, level): - # It's not clear if there is any way to tell if a Bowtie2 index is - # correct or not. - # bowtie2 does have an inspect method — this inspects at the dir level - # not on the file level. - # may also want to validate that all files have the same basename - pass - - -class Bowtie2IndexDirFmt(model.DirectoryFormat): - idx1 = model.File(r'.+(?