diff --git a/examples/elements/matplotlib/RGB.ipynb b/examples/elements/matplotlib/RGB.ipynb index 1c784e0130..cecfc5aadc 100644 --- a/examples/elements/matplotlib/RGB.ipynb +++ b/examples/elements/matplotlib/RGB.ipynb @@ -23,7 +23,7 @@ "source": [ "import numpy as np\n", "import holoviews as hv\n", - "hv.notebook_extension('bokeh')" + "hv.notebook_extension()" ] }, { @@ -114,9 +114,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python [conda env:science]", + "display_name": "Python 2", "language": "python", - "name": "conda-env-science-py" + "name": "python2" }, "language_info": { "codemirror_mode": { diff --git a/examples/elements/matplotlib/Raster.ipynb b/examples/elements/matplotlib/Raster.ipynb index 446f83fa30..c8d5f9e6df 100644 --- a/examples/elements/matplotlib/Raster.ipynb +++ b/examples/elements/matplotlib/Raster.ipynb @@ -23,7 +23,7 @@ "source": [ "import numpy as np\n", "import holoviews as hv\n", - "hv.notebook_extension('bokeh')" + "hv.notebook_extension()" ] }, { diff --git a/examples/elements/matplotlib/Scatter.ipynb b/examples/elements/matplotlib/Scatter.ipynb index cd7856e3e6..6f826be9f6 100644 --- a/examples/elements/matplotlib/Scatter.ipynb +++ b/examples/elements/matplotlib/Scatter.ipynb @@ -23,7 +23,7 @@ "source": [ "import numpy as np\n", "import holoviews as hv\n", - "hv.notebook_extension('bokeh')" + "hv.notebook_extension()" ] }, { @@ -115,9 +115,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python [conda env:science]", + "display_name": "Python 2", "language": "python", - "name": "conda-env-science-py" + "name": "python2" }, "language_info": { "codemirror_mode": { diff --git a/examples/elements/matplotlib/Spikes.ipynb b/examples/elements/matplotlib/Spikes.ipynb index 9148325687..d2c33c66ae 100644 --- a/examples/elements/matplotlib/Spikes.ipynb +++ b/examples/elements/matplotlib/Spikes.ipynb @@ -23,7 +23,7 @@ "source": [ "import numpy as np\n", "import holoviews as hv\n", - "hv.notebook_extension('bokeh')" + "hv.notebook_extension()" ] }, { @@ -43,7 +43,7 @@ }, "outputs": [], "source": [ - "%%opts Spikes (line_alpha=0.4) [spike_length=0.1]\n", + "%%opts Spikes (alpha=0.4) [spike_length=0.1]\n", "xs = np.random.rand(50)\n", "hv.Spikes(xs)" ] @@ -122,7 +122,7 @@ }, "outputs": [], "source": [ - "%%opts Spikes (line_alpha=0.2)\n", + "%%opts Spikes (alpha=0.2)\n", "points = hv.Points(np.random.randn(500, 2))\n", "points << hv.Spikes(points['y']) << hv.Spikes(points['x'])" ] @@ -130,9 +130,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python [conda env:science]", + "display_name": "Python 2", "language": "python", - "name": "conda-env-science-py" + "name": "python2" }, "language_info": { "codemirror_mode": { diff --git a/examples/elements/matplotlib/Spline.ipynb b/examples/elements/matplotlib/Spline.ipynb index 6edcffb70c..0f0c9573bb 100644 --- a/examples/elements/matplotlib/Spline.ipynb +++ b/examples/elements/matplotlib/Spline.ipynb @@ -23,7 +23,7 @@ "source": [ "import numpy as np\n", "import holoviews as hv\n", - "hv.notebook_extension('bokeh')" + "hv.notebook_extension()" ] }, { @@ -41,16 +41,16 @@ }, "outputs": [], "source": [ - "%%opts Curve (color='#D3D3D3') Spline (line_width=6 color='green')\n", + "%%opts Curve (color='#D3D3D3') Spline (linewidth=6 edgecolor='green')\n", "points = [(-0.3, -0.3), (0,0), (0.25, -0.25), (0.3, 0.3)]\n", - "hv.Spline((points,[])) * hv.Curve(points)" + "hv.Spline((points, [1,4,4,4])) * hv.Curve(points)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Note that the Bokeh ``Spline`` does not support the same control codes as the [matplotlib version](../matplotlib/Spline.ipynb) which is why the codes are supplied above as an empty list." + "The first argument to ``Splines`` are the control point positions and the integers in the second list are the control codes, as documented in the [matplotlib splines documentation](http://matplotlib.org/api/path_api.html)." ] } ],