Skip to content

Commit

Permalink
Fixed flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jun 2, 2018
1 parent 2d8c40d commit b16c799
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion holoviews/core/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

from ..dimension import Dimension, process_dimensions
from ..element import Element
from ..ndmapping import OrderedDict, NdMapping
from ..ndmapping import OrderedDict
from ..spaces import HoloMap, DynamicMap
from .. import util

Expand Down
1 change: 0 additions & 1 deletion holoviews/core/data/array.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from collections import defaultdict
try:
import itertools.izip as zip
except ImportError:
Expand Down
1 change: 0 additions & 1 deletion holoviews/core/data/dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ def concat(cls, datasets, dimensions, vdims):
for d, k in zip(dimensions, key):
data[d.name] = k
dataframes.append(data)
template = datasets[0][1]
return dd.concat(dataframes)

@classmethod
Expand Down
1 change: 1 addition & 0 deletions holoviews/core/data/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def init(cls, eltype, data, kdims, vdims):
'actual shape: %s' % (vdim, valid_shape, shape), cls)
return data, {'kdims':kdims, 'vdims':vdims}, {}


@classmethod
def concat(cls, datasets, dimensions, vdims):
from . import Dataset
Expand Down
3 changes: 1 addition & 2 deletions holoviews/core/data/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ def cast(cls, datasets, datatype=None, cast_type=None):
with the given cast_type (if specified).
"""
datatype = datatype or cls.datatype
interfaces = list(util.unique_iterator((d.interface for d in datasets)))
cast = []
for ds in datasets:
if cast_type is not None or ds.interface.datatype != datatype:
Expand Down Expand Up @@ -296,7 +295,7 @@ def concatenate(cls, datasets, datatype=None):
"""
Utility function to concatenate an NdMapping of Dataset objects.
"""
from . import Dataset
from . import Dataset, default_datatype
if isinstance(datasets, NdMapping):
dimensions = datasets.kdims
datasets = datasets.data
Expand Down
10 changes: 6 additions & 4 deletions holoviews/core/ndmapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from . import util
from .dimension import OrderedDict, Dimension, Dimensioned, ViewableElement
from .util import (unique_iterator, sanitize_identifier, dimension_sort,
basestring, wrap_tuple, process_ellipses, get_ndmapping_label, pd)
basestring, wrap_tuple, process_ellipses, get_ndmapping_label)


class item_check(object):
Expand Down Expand Up @@ -429,9 +429,11 @@ def info(self):

def table(self, datatype=None, **kwargs):
"Creates a table from the stored keys and data."
new_data = [(key, value.table(datatype=datatype, **kwargs)) for key, value in self.data.items()]
tables = self.clone(tables, shared_data=False)
return value.interface.concatenate(tables)
from .data.interface import Interface
new_data = [(key, value.table(datatype=datatype, **kwargs))
for key, value in self.data.items()]
tables = self.clone(new_data)
return Interface.concatenate(tables)


def dframe(self):
Expand Down

0 comments on commit b16c799

Please sign in to comment.