[med-svn] [Git][med-team/q2-taxa][upstream] New upstream version 2024.5.0+dfsg

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch upstream at Debian Med / q2-taxa


Commits:
38843b85 by Michael R. Crusoe at 2024-06-26T13:26:52+02:00
New upstream version 2024.5.0+dfsg
- - - - -


3 changed files:

- q2_taxa/_method.py
- q2_taxa/_version.py
- q2_taxa/plugin_setup.py


Changes:

=====================================
q2_taxa/_method.py
=====================================
@@ -79,7 +79,7 @@ def _ids_to_keep_from_taxonomy(feature_ids, taxonomy, include, exclude,
             # becomes an issue, this is a target for refactoring.
             ids_to_keep -= set(taxonomy.get_ids(where=query))
 
-    return ids_to_keep
+    return list(ids_to_keep)
 
 
 def filter_table(table: pd.DataFrame, taxonomy: qiime2.Metadata,


=====================================
q2_taxa/_version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (tag: 2024.2.0, Release-2024.2)"
-    git_full = "2f8e51958e1cc9f334a5535550b788c03bb5f45a"
-    git_date = "2024-02-16 21:57:06 +0000"
+    git_refnames = " (tag: 2024.5.0, Release-2024.5)"
+    git_full = "5a46cfbf681cac8c7717df871547f5323c29865e"
+    git_date = "2024-05-29 04:18:32 +0000"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 


=====================================
q2_taxa/plugin_setup.py
=====================================
@@ -16,6 +16,7 @@ from q2_types.feature_table import FeatureTable, Frequency, PresenceAbsence
 from . import barplot, collapse, filter_table, filter_seqs
 import q2_taxa._examples as ex
 
+T1 = qiime2.plugin.TypeMatch([Frequency, PresenceAbsence])
 
 plugin = qiime2.plugin.Plugin(
     name='taxa',
@@ -67,7 +68,7 @@ plugin.methods.register_function(
     function=filter_table,
     inputs={
         'taxonomy': FeatureData[Taxonomy],
-        'table': FeatureTable[Frequency]
+        'table': FeatureTable[T1]
     },
     parameters={'include': qiime2.plugin.Str,
                 'exclude': qiime2.plugin.Str,
@@ -75,7 +76,7 @@ plugin.methods.register_function(
                     qiime2.plugin.Str % qiime2.plugin.Choices(
                         ['exact', 'contains']),
                 'query_delimiter': qiime2.plugin.Str},
-    outputs=[('filtered_table', FeatureTable[Frequency])],
+    outputs=[('filtered_table', FeatureTable[T1])],
     input_descriptions={
         'taxonomy': ('Taxonomic annotations for features in the provided '
                      'feature table. All features in the feature table must '



View it on GitLab: https://salsa.debian.org/med-team/q2-taxa/-/commit/38843b85ae481f1e685ae703179473b491e7d4b1

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/q2-taxa/-/commit/38843b85ae481f1e685ae703179473b491e7d4b1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240626/b836fc39/attachment-0001.htm>