Merge remote-tracking branch 'macabe/warning-filters' into warning-filters

Author: colinvwood

q2cli/commands.py

@@ -549,10 +549,15 @@ def __call__(self, **kwargs):
 
         cleanup_logfile = False
         try:
+<<<<<<< HEAD
             with (
                 capture_rachis_warnings() if not quiet else nullcontext(),
                 qiime2.util.redirected_stdio(stdout=log, stderr=log)
             ):
+=======
+            with (qiime2.util.redirected_stdio(stdout=log, stderr=log),
+                 filter_rachis_warnings()):
+>>>>>>> macabe/warning-filters
                 if parallel:
                     from qiime2.sdk.parallel_config import \
                         (load_config_from_file, ParallelConfig)