Merge ca17971 into af9e2be

qiime2 · Nov 17, 2020 · 3f27bd5 · 3f27bd5
2 parents af9e2be + ca17971
commit 3f27bd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -21,7 +21,7 @@ requirements:
     - scikit-bio >=0.5.5
     - numpy
     - blas=*=openblas
-    - pandas <1
+    - pandas >1
     - biom-format >=2.1.5,<2.2.0
     - ijson
     - h5py

diff --git a/q2_types/feature_data/tests/test_transformer.py b/q2_types/feature_data/tests/test_transformer.py
@@ -10,7 +10,7 @@
 import unittest
 
 import pandas as pd
-import pandas.io.common
+import pandas.errors
 import biom
 import skbio
 import qiime2
@@ -315,13 +315,13 @@ def test_one_column(self):
                 self.get_data_path(os.path.join('taxonomy', '1-column.tsv')))
 
     def test_blanks(self):
-        with self.assertRaises(pandas.io.common.EmptyDataError):
+        with self.assertRaises(pandas.errors.EmptyDataError):
             _taxonomy_formats_to_dataframe(
                 self.get_data_path(os.path.join('taxonomy',
                                                 'blanks')))
 
     def test_empty(self):
-        with self.assertRaises(pandas.io.common.EmptyDataError):
+        with self.assertRaises(pandas.errors.EmptyDataError):
             _taxonomy_formats_to_dataframe(
                 self.get_data_path(os.path.join('taxonomy', 'empty')))
 
@@ -338,7 +338,7 @@ def test_has_header_with_headerless(self):
                 has_header=True)
 
     def test_jagged(self):
-        with self.assertRaises(pandas.io.common.ParserError):
+        with self.assertRaises(pandas.errors.ParserError):
             _taxonomy_formats_to_dataframe(
                 self.get_data_path(os.path.join('taxonomy', 'jagged.tsv')))