diff --git a/redbiom/fetch.py b/redbiom/fetch.py index 023a75c..770e120 100644 --- a/redbiom/fetch.py +++ b/redbiom/fetch.py @@ -429,7 +429,7 @@ def taxon_ancestors(context, ids, get=None, normalize=None): --------------------- HMGET :taxonomy-parents ... """ - from future.moves.itertools import zip_longest + from itertools import zip_longest import redbiom._requests if get is None: diff --git a/redbiom/tests/test_fetch.py b/redbiom/tests/test_fetch.py index e24f8d5..a122a02 100644 --- a/redbiom/tests/test_fetch.py +++ b/redbiom/tests/test_fetch.py @@ -1,6 +1,6 @@ import unittest import requests -from future.moves.itertools import zip_longest +from itertools import zip_longest import numpy as np import biom diff --git a/redbiom/tests/test_summarize.py b/redbiom/tests/test_summarize.py index 72b7b67..c37e015 100644 --- a/redbiom/tests/test_summarize.py +++ b/redbiom/tests/test_summarize.py @@ -3,7 +3,7 @@ import biom import pandas as pd -import pandas.util.testing as pdt +import pandas.testing as pdt import redbiom import redbiom.admin diff --git a/redbiom/tests/test_where_expr.py b/redbiom/tests/test_where_expr.py index af90339..713337d 100644 --- a/redbiom/tests/test_where_expr.py +++ b/redbiom/tests/test_where_expr.py @@ -1,6 +1,6 @@ import unittest import pandas as pd -import pandas.util.testing as pdt +import pandas.testing as pdt from redbiom.where_expr import whereeval, _cast_retain_numeric @@ -19,7 +19,9 @@ class WhereTests(unittest.TestCase): def test_cast_retain_numeric(self): tests = [(pd.Series(['a', '10', '1.23']), pd.Series([10.0, 1.23], index=[1, 2])), - (pd.Series(['a', 'b', 'c']), pd.Series([])), + # the default dtype for empty Series was changed from float64 + # to object for current versions of Pandas. + (pd.Series(['a', 'b', 'c']), pd.Series([], dtype='float64')), (pd.Series(['1', '2', '3', '4']), pd.Series([1, 2, 3, 4], index=[0, 1, 2, 3]))]