Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notebook flake fixes. #2439

Merged
merged 2 commits into from
Mar 19, 2018
Merged

Notebook flake fixes. #2439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3243fbe
Notebook flake fixes.
ceball Mar 12, 2018
1a4c1f2
Minor cleanup after flake fixes
philippjfr Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/getting_started/4-Gridded_Datasets.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"outputs": [],
"source": [
"import numpy as np\n",
"import pandas as pd\n",
"import holoviews as hv\n",
"hv.extension('bokeh', 'matplotlib')"
]
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/01-Annotating_Data.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"outputs": [],
"source": [
"import holoviews as hv\n",
"import holoviews.util\n",
"hv.extension('bokeh')"
]
},
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/04-Dimensioned_Containers.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"outputs": [],
"source": [
"import numpy as np\n",
"import pandas as pd\n",
"import holoviews as hv\n",
"hv.notebook_extension('bokeh')\n",
"%opts Curve (line_width=1)"
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/08-Gridded_Datasets.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"metadata": {},
"outputs": [],
"source": [
"import xarray as xr\n",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately I made a manual error here when dealing with the flakes caught by nbsmoke - xr is used. I'll make a new PR (probably alongside doing python 2 lint checks).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

"import numpy as np\n",
"import holoviews as hv\n",
"hv.extension('matplotlib')\n",
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/11-Responding_to_Events.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"source": [
"import numpy as np\n",
"import holoviews as hv\n",
"import numpy as np\n",
"hv.extension('bokeh')"
]
},
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/13-Data_Pipelines.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"metadata": {},
"outputs": [],
"source": [
"import numpy as np\n",
"import pandas as pd\n",
"import holoviews as hv\n",
"from bokeh.sampledata import stocks\n",
Expand Down
2 changes: 1 addition & 1 deletion examples/user_guide/14-Large_Data.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"import numpy as np\n",
"import holoviews as hv\n",
"import datashader as ds\n",
"from holoviews.operation.datashader import aggregate, shade, datashade, dynspread\n",
"from holoviews.operation.datashader import aggregate, datashade, dynspread\n",
"from holoviews.operation import decimate\n",
"hv.extension('bokeh')\n",
"decimate.max_samples=1000\n",
Expand Down
3 changes: 1 addition & 2 deletions examples/user_guide/16-Dashboards.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"metadata": {},
"outputs": [],
"source": [
"import numpy as np\n",
"import pandas as pd\n",
"import holoviews as hv\n",
"from bokeh.sampledata import stocks\n",
Expand Down Expand Up @@ -67,7 +66,7 @@
"import param\n",
"import paramnb\n",
"\n",
"class StockExplorer(hv.streams.Stream):\n",
"class StockExplorer(Stream):\n",
" \n",
" rolling_window = param.Integer(default=10, bounds=(1, 365))\n",
" \n",
Expand Down
9 changes: 4 additions & 5 deletions examples/user_guide/Deploying_Bokeh_Apps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,12 @@
"metadata": {},
"outputs": [],
"source": [
"def show_callback():\n",
" server.show('/')\n",
"loop.add_callback(show_callback)\n",
"server.start()\n",
"server.show('/')\n",
"\n",
"# Outside the notebook ioloop needs to be started\n",
"# from tornado.ioloop import IOLoop\n",
"# loop = IOLoop.current()\n",
"# loop.start() "
]
},
Expand Down Expand Up @@ -551,8 +552,6 @@
"import numpy as np\n",
"import holoviews as hv\n",
"\n",
"from bokeh.application.handlers import FunctionHandler\n",
"from bokeh.application import Application\n",
"from bokeh.io import show\n",
"from bokeh.layouts import layout\n",
"from bokeh.models import Slider, Button\n",
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/Exporting_and_Archiving.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"metadata": {},
"outputs": [],
"source": [
"import numpy as np\n",
"import holoviews as hv\n",
"from holoviews.operation import contours\n",
"hv.extension()"
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/Network_Graphs.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@
"outputs": [],
"source": [
"%%opts Graph [tools=['hover']]\n",
"import networkx as nx\n",
"G = nx.karate_club_graph()\n",
"hv.Graph.from_networkx(G, nx.layout.circular_layout).redim.range(**padding)"
]
Expand Down
3 changes: 1 addition & 2 deletions examples/user_guide/Plots_and_Renderers.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@
"metadata": {},
"outputs": [],
"source": [
"from holoviews.plotting.mpl import MPLRenderer\n",
"renderer = MPLRenderer.instance(dpi=120)"
"renderer = hv.plotting.mpl.MPLRenderer.instance(dpi=120)"
]
},
{
Expand Down
1 change: 0 additions & 1 deletion examples/user_guide/Tips_and_Tricks.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"metadata": {},
"outputs": [],
"source": [
"import numpy as np\n",
"import holoviews as hv\n",
"hv.extension('bokeh')"
]
Expand Down