Skip to content

Commit

Permalink
Finalized old deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Nov 23, 2018
1 parent 2931897 commit 8f5f0ac
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 52 deletions.
2 changes: 1 addition & 1 deletion examples/user_guide/12-Custom_Interactivity.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"```\n",
"The linked stream classes supported by HoloViews are:\n",
"\n",
"Bounds, BoundsX, BoundsY, DoubleTap, Draw, LinkedStream, MouseEnter, MouseLeave, PlotSize, PointerX, PointerXY, PointerY, PositionX, PositionXY, PositionY, RangeX, RangeXY, RangeY, Selection1D, SingleTap, Tap\n",
"Bounds, BoundsX, BoundsY, DoubleTap, Draw, LinkedStream, MouseEnter, MouseLeave, PlotSize, PointerX, PointerXY, PointerY, RangeX, RangeXY, RangeY, Selection1D, SingleTap, Tap\n",
"```"
]
},
Expand Down
1 change: 0 additions & 1 deletion holoviews/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
GridSpace, GridMatrix)

from .operation import Operation # noqa (API import)
from .operation import ElementOperation # noqa (Deprecated API import)
from .element import * # noqa (API import)
from .element import __all__ as elements_list
from .util import (extension, renderer, output, opts, # noqa (API import)
Expand Down
10 changes: 0 additions & 10 deletions holoviews/core/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,6 @@ def __call__(self, new_type, kdims=None, vdims=None, groupby=None,
can be automatically sorted via the sort option and kwargs can
be passed through.
"""
if 'mdims' in kwargs:
if groupby:
raise ValueError('Cannot supply both mdims and groupby')
else:
self._element.warning("'mdims' keyword has been renamed "
"to 'groupby'; the name mdims is "
"deprecated and will be removed "
"after version 1.7.")
groupby = kwargs.pop('mdims')

element_params = new_type.params()
kdim_param = element_params['kdims']
vdim_param = element_params['vdims']
Expand Down
3 changes: 2 additions & 1 deletion holoviews/core/dimension.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,8 @@ def spec(self):


def __call__(self, spec=None, **overrides):
"Aliased to clone method. To be deprecated in 2.0"
self.warning('Dimension.__call__ method has been deprecated, '
'use the clone method instead.')
return self.clone(spec=spec, **overrides)


Expand Down
7 changes: 4 additions & 3 deletions holoviews/core/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,10 @@ def mapping(self, kdims=None, vdims=None, **kwargs):
Deprecated method to convert Element data to an old dictionary
format which is no longer supported.
"""
self.warning("The mapping method is deprecated and should no "
"longer be used. Use another one of the common "
"formats instead, e.g. .dframe, .array or .columns.")
if config.future_deprecations:
self.warning("The mapping method is deprecated and should no "
"longer be used. Use another one of the common "
"formats instead, e.g. .dframe, .array or .columns.")

length = len(self)
if not kdims: kdims = self.kdims
Expand Down
10 changes: 0 additions & 10 deletions holoviews/core/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,6 @@ def clone(self, *args, **overrides):
return clone


# To be removed after 1.3.0
class Warning(param.Parameterized): pass
collate_deprecation = Warning(name='Deprecation Warning')

class Layout(ViewableTree):
"""
A Layout is an ViewableTree with ViewableElement objects as leaf
Expand Down Expand Up @@ -412,12 +408,6 @@ def cols(self, ncols):
return self


def display(self, option):
"Sets the display policy of the Layout before returning self"
self.warning('Layout display option is deprecated and no longer needs to be used')
return self


def grid_items(self):
return {tuple(np.unravel_index(idx, self.shape)): (path, item)
for idx, (path, item) in enumerate(self.items())}
Expand Down
6 changes: 0 additions & 6 deletions holoviews/core/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,6 @@ def __call__(self, element, **params):
return processed


class ElementOperation(Operation):

def __init__(self, *args, **kwargs):
self.warning('ElementOperation has been deprecated and renamed to Operation.')
super(ElementOperation, self).__init__(*args, **kwargs)


class OperationCallable(Callable):
"""
Expand Down
1 change: 0 additions & 1 deletion holoviews/operation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from ..core.operation import Operation # noqa (API import)
from ..core.operation import ElementOperation # noqa (Deprecated API import)
from ..core.options import Compositor

from .element import * # noqa (API import)
Expand Down
19 changes: 0 additions & 19 deletions holoviews/streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -896,24 +896,6 @@ def __init__(self, *args, **params):
super(PlotReset, self).__init__(self, *args, **dict(params, transient=True))



class PositionX(PointerX):
def __init__(self, **params):
self.warning('PositionX stream deprecated: use PointerX instead')
super(PositionX, self).__init__(**params)

class PositionY(PointerY):
def __init__(self, **params):
self.warning('PositionY stream deprecated: use PointerY instead')
super(PositionY, self).__init__(**params)

class PositionXY(PointerXY):
def __init__(self, **params):
self.warning('PositionXY stream deprecated: use PointerXY instead')
super(PositionXY, self).__init__(**params)



class CDSStream(LinkedStream):
"""
A Stream that syncs a bokeh ColumnDataSource with python.
Expand All @@ -926,7 +908,6 @@ class CDSStream(LinkedStream):
path-like data).""")



class PointDraw(CDSStream):
"""
Attaches a PointAddTool and syncs the datasource.
Expand Down

0 comments on commit 8f5f0ac

Please sign in to comment.