diff --git a/setup.py b/setup.py index 24a6b799..1409fb47 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ PREFIX = os.environ.get('PREFIX', "") base = ["cython >= 0.26", "biom-format", "numpy", "h5py >= 3.3.0", - "scikit-bio >= 0.5.8", "iow"] + "scikit-bio >= 0.6.0", "iow"] test = ["nose", "flake8"] diff --git a/unifrac/tests/test_api.py b/unifrac/tests/test_api.py index 25eab211..1586b9e6 100644 --- a/unifrac/tests/test_api.py +++ b/unifrac/tests/test_api.py @@ -37,7 +37,7 @@ def test_unweighted_inmem(self): otu_ids = table.ids(axis='observation') cnts = table.matrix_data.astype(int).toarray().T exp = skbio.diversity.beta_diversity('unweighted_unifrac', cnts, - ids=ids, otu_ids=otu_ids, + ids=ids, taxa=otu_ids, tree=tree) obs = ssu_inmem(table, tree, 'unweighted', False, 1.0, False, 1) @@ -57,7 +57,7 @@ def test_unweighted_fp32_inmem(self): otu_ids = table.ids(axis='observation') cnts = table.matrix_data.astype(int).toarray().T exp = skbio.diversity.beta_diversity('unweighted_unifrac', cnts, - ids=ids, otu_ids=otu_ids, + ids=ids, taxa=otu_ids, tree=tree) obs = ssu_inmem(table, tree, 'unweighted_fp32', False, 1.0, False, 1) @@ -77,7 +77,7 @@ def test_unweighted_fp64_inmem(self): otu_ids = table.ids(axis='observation') cnts = table.matrix_data.astype(int).toarray().T exp = skbio.diversity.beta_diversity('unweighted_unifrac', cnts, - ids=ids, otu_ids=otu_ids, + ids=ids, taxa=otu_ids, tree=tree) obs = ssu_inmem(table, tree, 'unweighted_fp64', False, 1.0, False, 1) @@ -102,7 +102,7 @@ def test_unweighted_root_eval_issue_46(self): otu_ids = table_inmem.ids(axis='observation') cnts = table_inmem.matrix_data.astype(int).toarray().T exp = skbio.diversity.beta_diversity('unweighted_unifrac', cnts, - ids=ids, otu_ids=otu_ids, + ids=ids, taxa=otu_ids, tree=tree_inmem) obs = ssu(table, tree, 'unweighted', False, 1.0, False, 1) npt.assert_almost_equal(obs.data, exp.data, decimal=6)