Merge pull request #11427 from jklymak/fix-pathlib-nbagg

tacaswell · web-flow · commit 7457edaf368d · 2018-06-12T22:46:28.000-05:00
FIX: pathlib in nbagg
diff --git a/.travis.yml b/.travis.yml
@@ -54,6 +54,7 @@ env:
     - NOSE=
     - NUMPY=numpy
     - PANDAS=
+    - JUPYTER=
     - PYPARSING=pyparsing
     - PYTEST='pytest>=3.4'
     - PYTEST_COV=pytest-cov
@@ -94,6 +95,7 @@ matrix:
       env:
         - DELETE_FONT_CACHE=1
         - PANDAS='pandas<0.21.0'
+        - JUPYTER='jupyter'
         - PYTEST_PEP8=pytest-pep8
         - PYTEST_ADDOPTS="$PYTEST_ADDOPTS --pep8"
     - python: "nightly"
@@ -147,6 +149,7 @@ install:
         $NOSE \
         $NUMPY \
         $PANDAS \
+        $JUPYTER \
         pillow \
         $PYPARSING \
         $SPHINX \
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -7,6 +7,7 @@
 import io
 import json
 import os
+import pathlib
 import uuid
 
 from IPython.display import display, Javascript, HTML
@@ -111,7 +112,8 @@ def get_javascript(cls, stream=None):
         else:
             output = stream
         super().get_javascript(stream=output)
-        output.write((Path(__file__).parent / "web_backend/js/nbagg_mpl.js")
+        output.write((pathlib.Path(__file__).parent
+                      / "web_backend/js/nbagg_mpl.js")
                      .read_text(encoding="utf-8"))
         if stream is None:
             return output.getvalue()
diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -0,0 +1,33 @@
+
+import os
+import subprocess
+import tempfile
+import pytest
+
+nbformat = pytest.importorskip('nbformat')
+
+# From https://blog.thedataincubator.com/2016/06/testing-jupyter-notebooks/
+
+
+def _notebook_run(nb_file):
+    """Execute a notebook via nbconvert and collect output.
+       :returns (parsed nb object, execution errors)
+    """
+    with tempfile.NamedTemporaryFile(suffix=".ipynb") as fout:
+        args = ["jupyter", "nbconvert", "--to", "notebook", "--execute",
+          "--ExecutePreprocessor.timeout=500",
+          "--output", fout.name, nb_file]
+        subprocess.check_call(args)
+
+        fout.seek(0)
+        nb = nbformat.read(fout, nbformat.current_nbformat)
+
+    errors = [output for cell in nb.cells if "outputs" in cell
+                     for output in cell["outputs"]
+                     if output.output_type == "error"]
+    return nb, errors
+
+
+def test_ipynb():
+    nb, errors = _notebook_run('lib/matplotlib/tests/test_nbagg_01.ipynb')
+    assert errors == []
diff --git a/lib/matplotlib/tests/test_nbagg_01.ipynb b/lib/matplotlib/tests/test_nbagg_01.ipynb
