@@ -1,50 +1,64 @@

 # -*- coding: utf-8 -*-

 import asyncio

+from pkg_resources import parse_version

+import warnings

 from IPython import get_ipython

+import ipykernel

 from ipykernel.eventloops import register_integration

-# IPython event loop integraion

-

-@register_integration('asyncio')

-def _loop_asyncio(kernel):

-    '''Start a kernel with asyncio event loop support.'''

-    loop = asyncio.get_event_loop()

-

-    def kernel_handler():

-        loop.call_soon(kernel.do_one_iteration)

-        loop.call_later(kernel._poll_interval, kernel_handler)

-

-    loop.call_soon(kernel_handler)

-    # loop is already running (e.g. tornado 5), nothing left to do

-    if loop.is_running():

-        return

-    while True:

-        error = None

-        try:

-            loop.run_forever()

-        except KeyboardInterrupt:

-            continue

-        except Exception as e:

-            error = e

-        loop.run_until_complete(loop.shutdown_asyncgens())

-        loop.close()

-        if error is not None:

-            raise error

-        break

+# IPython event loop integration

+

+if parse_version(ipykernel.__version__) < parse_version('4.7.0'):

+    # XXX: remove this function when we depend on ipykernel>=4.7.0

+    @register_integration('asyncio')

+    def _loop_asyncio(kernel):

+        """Start a kernel with asyncio event loop support.

+        Taken from https://github.com/ipython/ipykernel/blob/fa814da201bdebd5b16110597604f7dabafec58d/ipykernel/eventloops.py#L294"""

+        loop = asyncio.get_event_loop()

+

+        def kernel_handler():

+            loop.call_soon(kernel.do_one_iteration)

+            loop.call_later(kernel._poll_interval, kernel_handler)

+

+        loop.call_soon(kernel_handler)

+        # loop is already running (e.g. tornado 5), nothing left to do

+        if loop.is_running():

+            return

+        while True:

+            error = None

+            try:

+                loop.run_forever()

+            except KeyboardInterrupt:

+                continue

+            except Exception as e:

+                error = e

+            loop.run_until_complete(loop.shutdown_asyncgens())

+            loop.close()

+            if error is not None:

+                raise error

+            break

 def notebook_extension():

-    import holoviews

     get_ipython().magic('gui asyncio')

-    return holoviews.notebook_extension('bokeh')

+    try:

+        import holoviews as hv

+        return hv.notebook_extension('bokeh')

+    except ModuleNotFoundError:

+        warnings.warn("The holoviews package is not installed so plotting"

+                      "will not work.", RuntimeWarning)

 # Plotting

 def live_plot(runner, *, plotter=None, update_interval=2):

-    import holoviews as hv

+    try:

+        import holoviews as hv

+    except ModuleNotFoundError:

+        raise RuntimeError('Plotting requires the holoviews Python package'

+                           ' which is not installed.')

     def plot_generator():

         while True: