From 50909a5a1ef2859dc96e0178ae5c531fe5e7f7ea Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 17 Nov 2020 11:19:49 -0700 Subject: [PATCH] DEPS: pandas 1 --- ci/recipe/meta.yaml | 2 +- q2_types/feature_data/tests/test_transformer.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index 7a2c3ad7..b114c3f7 100644 --- 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 index 8cb8c49a..289abb05 100644 --- 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')))