Port to latest holoviews

topo/analysis/__init__.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 
-from holoviews.interface.collector import Reference
+from holoviews.core.io import Reference
 from holoviews import HSV, Image
 from holoviews.core.options import Compositor
 from holoviews.ipython import IPTestCase

topo/analysis/command.py

@@ -205,9 +205,9 @@ def _update_proj_cog(self, p, proj):
 
         timestamp = topo.sim.time()
         lbrt = sheet.bounds.lbrt()
-        xsv = Image(xcog, sheet.bounds, label=proj.name, group='X CoG',
+        xsv = Image(xcog, bounds=sheet.bounds, label=proj.name, group='X CoG',
                     vdims=[Dimension('X CoG', range=(lbrt[0], lbrt[2]))])
-        ysv = Image(ycog, sheet.bounds, label=proj.name, group='Y CoG',
+        ysv = Image(ycog, bounds=sheet.bounds, label=proj.name, group='Y CoG',
                     vdims=[Dimension('Y CoG', range=(lbrt[1], lbrt[3]))])
 
         lines = []

topo/analysis/featureresponses.py

@@ -16,7 +16,7 @@
 
 from holoviews import Image, HoloMap
 from holoviews.ipython.widgets import ProgressBar
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 
 import topo
 import topo.base.sheetcoords
@@ -52,14 +52,14 @@ def update_sheet_activity(sheet_name, force=False):
                         src_name=sheet.name, shape=sheet.activity.shape,
                         timestamp=time)
     if not view:
-        im = Image(np.array(sheet.activity), sheet.bounds)
+        im = Image(np.array(sheet.activity), bounds=sheet.bounds)
         im.metadata=metadata
         view = HoloMap((time, im), key_dimensions=[Time])
         view.metadata = metadata
         sheet.views.Maps[name] = view
     else:
         if force or view.range('Time')[1] < time:
-            im = Image(np.array(sheet.activity), sheet.bounds)
+            im = Image(np.array(sheet.activity), bounds=sheet.bounds)
             im.metadata=metadata
             view[time] = im
     return view

topo/base/cf.py

@@ -23,7 +23,7 @@
 
 import param
 from holoviews import GridSpace, Dimension, HoloMap, Layout
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 from holoviews.core import BoundingBox, BoundingRegionParameter, Slice
 
 import patterngenerator
@@ -782,7 +782,7 @@ def view(self, sheet_x, sheet_y, timestamp=None, situated=False, **kwargs):
             matrix_data = cf.weights.copy()
             bounds = roi_bounds
 
-        sv = CFView(matrix_data, bounds, situated_bounds=situated_bounds,
+        sv = CFView(matrix_data, bounds=bounds, situated_bounds=situated_bounds,
                     input_sheet_slice=(r1, r2, c1, c2), roi_bounds=roi_bounds,
                     label=self.name, group='CF Weight')
         sv.metadata=AttrDict(timestamp=timestamp)

topo/base/generatorsheet.py

@@ -8,7 +8,7 @@
 from topo.base.patterngenerator import PatternGenerator,Constant
 from topo.base.simulation import FunctionEvent, PeriodicEventSequence
 
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 from holoviews import Image
 
 import numpy as np
@@ -279,7 +279,7 @@ def __getitem__(self, coords):
         else:
             arr = self.activity.copy()
 
-        im = Image(arr, self.bounds,
+        im = Image(arr, bounds=self.bounds,
                    label=self.name+' Activity', group='Activity')[coords]
         im.metadata=metadata
         return im

topo/base/projection.py

@@ -12,7 +12,7 @@
 
 from imagen import Disk
 from holoviews import Image, Layout
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 
 from sheet import Sheet
 from simulation import EPConnection
@@ -326,7 +326,7 @@ def projection_view(self, timestamp=None):
         """Returns the activity in a single projection"""
         if timestamp is None:
             timestamp = self.src.simulation.time()
-        im = Image(self.activity.copy(), self.dest.bounds,
+        im = Image(self.activity.copy(), bounds=self.dest.bounds,
                    label=self.name, group='Activity')
         im.metadata=AttrDict(proj_src_name=self.src.name,
                              precedence=self.src.precedence,

topo/base/sheet.py

@@ -24,7 +24,7 @@
 
 from holoviews import Image, Layout
 from holoviews.core import BoundingBox, BoundingRegionParameter, SheetCoordinateSystem
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 
 from simulation import EventProcessor
 from functionfamily import TransferFn
@@ -309,7 +309,7 @@ def __getitem__(self, coords):
                             row_precedence=self.row_precedence,
                             timestamp=self.simulation.time())
 
-        image = Image(self.activity.copy(), self.bounds,
+        image = Image(self.activity.copy(), bounds=self.bounds,
                    label=self.name, group='Activity')[coords]
         image.metadata=metadata
         return image

topo/base/sheetview.py

@@ -117,7 +117,7 @@ def situated(self):
         r1, r2, c1, c2 = self.input_sheet_slice
         data[r1:r2, c1:c2] = self.data
 
-        return CFView(data, self.situated_bounds, roi_bounds=self.bounds,
+        return CFView(data, bounds=self.situated_bounds, roi_bounds=self.bounds,
                       situated_bounds=self.situated_bounds,
                       label=self.label, group=self.group)
 

topo/base/simulation.py

@@ -56,7 +56,7 @@
 import time
 import bisect
 
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 
 #: Default path to the current simulation, from main
 #: Only to be used by script_repr(), to allow it to generate

topo/misc/commandline.py

@@ -42,7 +42,7 @@
          from IPython.terminal.embed import InteractiveShellEmbed as IPShell
     except ImportError: # Prior to IPython 1.0, InteractiveShellEmbed was found in the frontend package
         from IPython.frontend.terminal.embed import InteractiveShellEmbed as IPShell # pyflakes:ignore (try/except import)
-    from IPython.config.loader import Config
+    from traitlets.config.loader import Config
     ipython_shell_interface = "InteractiveShellEmbed"
     try:
         from IPython.core.prompts import PromptManager  # pyflakes:ignore (try/except import)

topo/misc/lancext.py

@@ -15,7 +15,7 @@
 import param
 
 from holoviews import NdMapping, Layout
-from holoviews.interface.collector import Collector
+from featuremapper.collector import Collector
 from holoviews.core.element import Collator
 from holoviews.core.io import Pickler
 

topo/tests/unit/testplot.py

@@ -16,7 +16,7 @@
 import param
 
 from holoviews.core import BoundingBox, NdMapping
-from holoviews.interface.collector import AttrDict
+from topo.misc.attrdict import AttrDict
 from holoviews import Image