Compatibility with 'pkg test' (closes #4)

gnu-octave · Nov 23, 2021 · ddb903e · ddb903e
1 parent baf41be
commit ddb903e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/examples/octave_kernel.ipynb → doc/examples/octave_kernel.ipynb b/examples/octave_kernel.ipynb → doc/examples/octave_kernel.ipynb
diff --git a/examples/plot_magic_and_errors.ipynb → doc/examples/plot_magic_and_errors.ipynb b/examples/plot_magic_and_errors.ipynb → doc/examples/plot_magic_and_errors.ipynb
diff --git a/examples/plotting.ipynb → doc/examples/plotting.ipynb b/examples/plotting.ipynb → doc/examples/plotting.ipynb
diff --git a/src/jupyter_notebook.m b/src/jupyter_notebook.m
@@ -703,6 +703,19 @@ function addErrorOutput (obj, cell_index, error_msg)
 
 endclassdef
 
+%!shared example_dir
+%! ## development path
+%! example_dir = fullfile ("..", "doc", "examples");
+%! if (exist (fullfile (example_dir, "octave_kernel.ipynb"), "file") != 2)
+%!   ## installed package path
+%!   if (isempty (pkg ("list", "jupyter-notebook")))
+%!     error ("jupyter_notebook: cannot detect example directory");
+%!   else
+%!     example_dir = pkg ("list", "jupyter-notebook"){1}.dir;
+%!     example_dir = fullfile (example_dir, "doc", "examples");
+%!   endif
+%! endif
+%! assert (exist (fullfile (example_dir, "octave_kernel.ipynb"), "file"), 2);
 
 ## Test running a single cell
 %!test
@@ -721,7 +734,7 @@ function addErrorOutput (obj, cell_index, error_msg)
 %!   endif
 %!   set (0, "defaultfigurevisible", "off");
 %!
-%!   n = jupyter_notebook (fullfile ("..", "examples", "octave_kernel.ipynb"));
+%!   n = jupyter_notebook (fullfile (example_dir, "octave_kernel.ipynb"));
 %!
 %!   ## Test embedding images
 %!   n.run (2);
@@ -756,7 +769,7 @@ function addErrorOutput (obj, cell_index, error_msg)
 %!   endif
 %!   set (0, "defaultfigurevisible", "off");
 %!
-%!   n = jupyter_notebook (fullfile ("..", "examples", "octave_kernel.ipynb"));
+%!   n = jupyter_notebook (fullfile (example_dir, "octave_kernel.ipynb"));
 %!   n.run_all ();
 %!
 %!   ## Test embedding images
@@ -795,7 +808,7 @@ function addErrorOutput (obj, cell_index, error_msg)
 %!   endif
 %!   set (0, "defaultfigurevisible", "off");
 %!
-%!   n = jupyter_notebook (fullfile ("..", "examples",
+%!   n = jupyter_notebook (fullfile (example_dir, ...
 %!                                  "plot_magic_and_errors.ipynb"));
 %!
 %!   ## PNG format
@@ -840,7 +853,7 @@ function addErrorOutput (obj, cell_index, error_msg)
 %!   endif
 %!   set (0, "defaultfigurevisible", "off");
 %!
-%!   n = jupyter_notebook (fullfile ("..", "examples",
+%!   n = jupyter_notebook (fullfile (example_dir, ...
 %!                                  "plot_magic_and_errors.ipynb"));
 %!
 %!   ## Wrong resolution