Skip to content

Commit

Permalink
pandas is a requirement
Browse files Browse the repository at this point in the history
  • Loading branch information
scottgigante committed Jul 12, 2018
1 parent 255423c commit c546ff4
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions python/magic/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ def matrix_is_equivalent(X, Y):

def convert_to_same_format(data, target_data, columns=None):
# create new data object
if is_pandas(target_data, sparse=True):
if isinstance(target_data, pd.SparseDataFrame):
data = pd.SparseDataFrame(data)
pandas = True
elif is_pandas(target_data):
elif isinstance(target_data, pd.DataFrame):
data = pd.DataFrame(data)
pandas = True
elif is_anndata(target_data):
Expand Down Expand Up @@ -163,23 +163,6 @@ def in_ipynb():
return False


def is_pandas(data, sparse=None):
try:
if sparse is True:
return isinstance(data, pd.SparseDataFrame)
elif sparse is False:
return isinstance(data, pd.DataFrame) and not \
isinstance(data, pd.SparseDataFrame)
elif sparse is None:
return isinstance(data, pd.DataFrame)
else:
raise ValueError("Expected sparse in [True, False, None]. "
"Got {}".format(sparse))
except NameError:
# pandas not installed
return False


def is_anndata(data):
try:
return isinstance(data, anndata.AnnData)
Expand Down

0 comments on commit c546ff4

Please sign in to comment.