Skip to content

Commit

Permalink
Merge pull request #37 from sroet/fix_pandas_future_warn
Browse files Browse the repository at this point in the history
fixed pandas future warn about as_matrix
  • Loading branch information
dwhswenson authored May 30, 2018
2 parents 0173f86 + bdb4375 commit 277289a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contact_map/tests/test_contact_count.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def test_df(self):
assert isinstance(atom_df, pd.SparseDataFrame)
assert isinstance(residue_df, pd.SparseDataFrame)

assert_array_equal(atom_df.to_dense().as_matrix(),
assert_array_equal(atom_df.to_dense().values,
zero_to_nan(self.atom_matrix))
assert_array_equal(residue_df.to_dense().as_matrix(),
assert_array_equal(residue_df.to_dense().values,
zero_to_nan(self.residue_matrix))

@pytest.mark.parametrize("obj_type", ['atom', 'res'])
Expand Down

0 comments on commit 277289a

Please sign in to comment.