Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleaned up top-level namespace
Browse files Browse the repository at this point in the history
philippjfr committed Mar 13, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 723e73e commit b1a9776
Showing 5 changed files with 16 additions and 10 deletions.
10 changes: 4 additions & 6 deletions holoviews/__init__.py
Original file line number Diff line number Diff line change
@@ -17,13 +17,11 @@

from .core import archive, config # noqa (API import)
from .core.dimension import OrderedDict, Dimension # noqa (API import)
from .core.boundingregion import BoundingBox # noqa (API import)
from .core.options import (Options, Store, Cycle, # noqa (API import)
Palette, StoreOptions)
from .core.layout import * # noqa (API import)
from .core.element import * # noqa (API import)
from .core.overlay import * # noqa (API import)
from .core.tree import * # noqa (API import)
Palette)
from .core.layout import Layout, NdLayout, AdjointLayout # noqa (API import)
from .core.element import Collator # noqa (API import)
from .core.overlay import Overlay, NdOverlay # noqa (API import)
from .core.spaces import (HoloMap, Callable, DynamicMap, # noqa (API import)
GridSpace, GridMatrix)

6 changes: 6 additions & 0 deletions holoviews/core/element.py
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@ class Element(ViewableElement, Composable, Overlayable):

group = param.String(default='Element', constant=True)

__abstract = True

def hist(self, dimension=None, num_bins=20, bin_range=None,
adjoin=True, individually=True, **kwargs):
"""
@@ -262,6 +264,8 @@ class Element2D(Element):
of the Element in 2D space defined as four-tuple
defining the (left, bottom, right and top) edges.""")

__abstract = True


class Element3D(Element2D):

@@ -271,6 +275,8 @@ class Element3D(Element2D):
in 3D space defined as (xmin, ymin, zmin,
xmax, ymax, zmax).""")

__abstract = True


class Collator(NdMapping):
"""
2 changes: 1 addition & 1 deletion holoviews/core/ndmapping.py
Original file line number Diff line number Diff line change
@@ -719,7 +719,7 @@ class UniformNdMapping(NdMapping):

data_type = (ViewableElement, NdMapping)

_abstract = True
__abstract = True
_deep_indexable = True
_auxiliary_component = False

2 changes: 1 addition & 1 deletion holoviews/element/__init__.py
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ def vectorfield(self, kdims=None, vdims=None, groupby=None, **kwargs):


def public(obj):
if not isinstance(obj, type) or getattr(obj, 'abstract', False):
if not isinstance(obj, type) or getattr(obj, 'abstract', False) and not obj is Element:
return False
return issubclass(obj, Element)

6 changes: 4 additions & 2 deletions tests/core/testoptions.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import os
import pickle
import numpy as np
from holoviews import Store, StoreOptions, Histogram, Image
from holoviews.core.options import OptionError, Cycle, Options, OptionTree, options_policy
from holoviews import Store, Histogram, Image
from holoviews.core.options import (
OptionError, Cycle, Options, OptionTree, StoreOptions, options_policy
)
from holoviews.element.comparison import ComparisonTestCase
from holoviews import plotting # noqa Register backends
from unittest import SkipTest

0 comments on commit b1a9776

Please sign in to comment.