Merge branch '85_amrfinderplusannotation_type' into 87_annotate_mags_…

…amrfinderplus
bokulich-lab · Jul 9, 2024 · f10dcb3 · f10dcb3
2 parents 0cb8492 + 4f09ee7
commit f10dcb3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/q2_amr/amrfinderplus/types/_format.py b/q2_amr/amrfinderplus/types/_format.py
@@ -124,5 +124,7 @@ def annotation_path_maker(self, sample_id, mag_id):
 
 
 ARMFinderPlusAnnotationDirFmt = model.SingleFileDirectoryFormat(
-    "ARMFinderPlusAnnotationDirFmt", "amr_annotation.tsv", ARMFinderPlusAnnotationFormat
+    "ARMFinderPlusAnnotationDirFmt",
+    r"amr_(annotations|mutations)\.tsv$",
+    ARMFinderPlusAnnotationFormat,
 )