fixes #59

Author: jph00

execnb/_modidx.py

@@ -24,6 +24,7 @@
                               'execnb.shell.CaptureShell.__init__': ('shell.html#captureshell.__init__', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.cell': ('shell.html#captureshell.cell', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.complete': ('shell.html#captureshell.complete', 'execnb/shell.py'),
+                              'execnb.shell.CaptureShell.enable_gui': ('shell.html#captureshell.enable_gui', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.execute': ('shell.html#captureshell.execute', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.prettytb': ('shell.html#captureshell.prettytb', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.run': ('shell.html#captureshell.run', 'execnb/shell.py'),

execnb/shell.py

@@ -60,9 +60,9 @@ def __init__(self, path:str|Path=None, mpl_format='retina'):
         self.display_formatter.active = True
         if not IN_NOTEBOOK: InteractiveShell._instance = self
         if set_matplotlib_formats:
+            self.enable_matplotlib("inline")
             self.run_cell("from matplotlib_inline.backend_inline import set_matplotlib_formats")
             self.run_cell(f"set_matplotlib_formats('{mpl_format}')")
-            self.run_cell('%matplotlib inline')
 
     def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
                  stdout=True, stderr=True, display=True):
@@ -78,13 +78,15 @@ def set_path(self, path):
         path = Path(path)
         if path.is_file(): path = path.parent
         self.run_cell(f"import sys; sys.path.insert(0, '{path.as_posix()}')")
+    
+    def enable_gui(self, gui=None): pass
 
-# %% ../nbs/02_shell.ipynb 22
+# %% ../nbs/02_shell.ipynb 23
 def format_exc(e):
     "Format exception `e` as a string"
     return ''.join(traceback.format_exception(type(e), e, e.__traceback__))
 
-# %% ../nbs/02_shell.ipynb 23
+# %% ../nbs/02_shell.ipynb 24
 def _out_stream(text, name): return dict(name=name, output_type='stream', text=text.splitlines(True))
 def _out_exc(e):
     ename = type(e).__name__
@@ -114,7 +116,7 @@ def _out_nb(o, fmt):
         res.append(_mk_out(*fmt.format(r), 'execute_result'))
     return res
 
-# %% ../nbs/02_shell.ipynb 24
+# %% ../nbs/02_shell.ipynb 25
 @patch
 def run(self:CaptureShell,
         code:str, # Python/IPython code to run
@@ -126,7 +128,7 @@ def run(self:CaptureShell,
     self.exc = res.exception
     return _out_nb(res, self.display_formatter)
 
-# %% ../nbs/02_shell.ipynb 30
+# %% ../nbs/02_shell.ipynb 31
 def render_outputs(outputs, ansi_renderer=strip_ansi):
     def render_output(out):
         otype = out['output_type']
@@ -148,7 +150,7 @@ def render_output(out):
 
     return '\n'.join(map(render_output, outputs))
 
-# %% ../nbs/02_shell.ipynb 43
+# %% ../nbs/02_shell.ipynb 44
 @patch
 def cell(self:CaptureShell, cell, stdout=True, stderr=True):
     "Run `cell`, skipping if not code, and store outputs back in cell"
@@ -160,40 +162,40 @@ def cell(self:CaptureShell, cell, stdout=True, stderr=True):
         for o in outs:
             if 'execution_count' in o: cell['execution_count'] = o['execution_count']
 
-# %% ../nbs/02_shell.ipynb 46
+# %% ../nbs/02_shell.ipynb 47
 def find_output(outp, # Output from `run`
                 ot='execute_result' # Output_type to find
                ):
     "Find first output of type `ot` in `CaptureShell.run` output"
     return first(o for o in outp if o['output_type']==ot)
 
-# %% ../nbs/02_shell.ipynb 49
+# %% ../nbs/02_shell.ipynb 50
 def out_exec(outp):
     "Get data from execution result in `outp`."
     out = find_output(outp)
     if out: return '\n'.join(first(out['data'].values()))
 
-# %% ../nbs/02_shell.ipynb 51
+# %% ../nbs/02_shell.ipynb 52
 def out_stream(outp):
     "Get text from stream in `outp`."
     out = find_output(outp, 'stream')
     if out: return ('\n'.join(out['text'])).strip()
 
-# %% ../nbs/02_shell.ipynb 53
+# %% ../nbs/02_shell.ipynb 54
 def out_error(outp):
     "Get traceback from error in `outp`."
     out = find_output(outp, 'error')
     if out: return '\n'.join(out['traceback'])
 
-# %% ../nbs/02_shell.ipynb 55
+# %% ../nbs/02_shell.ipynb 56
 def _false(o): return False
 
 @patch
 def run_all(self:CaptureShell,
             nb, # A notebook read with `nbclient` or `read_nb`
             exc_stop:bool=False, # Stop on exceptions?
-            preproc:Callable=_false, # Called before each cell is executed
-            postproc:Callable=_false, # Called after each cell is executed
+            preproc:callable=_false, # Called before each cell is executed
+            postproc:callable=_false, # Called after each cell is executed
             inject_code:str|None=None, # Code to inject into a cell
             inject_idx:int=0 # Cell to replace with `inject_code`
            ):
@@ -205,14 +207,14 @@ def run_all(self:CaptureShell,
             postproc(cell)
         if self.exc and exc_stop: raise self.exc from None
 
-# %% ../nbs/02_shell.ipynb 69
+# %% ../nbs/02_shell.ipynb 70
 @patch
 def execute(self:CaptureShell,
             src:str|Path, # Notebook path to read from
             dest:str|None=None, # Notebook path to write to
             exc_stop:bool=False, # Stop on exceptions?
-            preproc:Callable=_false, # Called before each cell is executed
-            postproc:Callable=_false, # Called after each cell is executed
+            preproc:callable=_false, # Called before each cell is executed
+            postproc:callable=_false, # Called after each cell is executed
             inject_code:str|None=None, # Code to inject into a cell
             inject_path:str|Path|None=None, # Path to file containing code to inject into a cell
             inject_idx:int=0 # Cell to replace with `inject_code`
@@ -226,7 +228,7 @@ def execute(self:CaptureShell,
                  inject_code=inject_code, inject_idx=inject_idx)
     if dest: write_nb(nb, dest)
 
-# %% ../nbs/02_shell.ipynb 73
+# %% ../nbs/02_shell.ipynb 74
 @patch
 def prettytb(self:CaptureShell, 
              fname:str|Path=None): # filename to print alongside the traceback
@@ -238,7 +240,7 @@ def prettytb(self:CaptureShell,
     fname_str = f' in {fname}' if fname else ''
     return f"{type(self.exc).__name__}{fname_str}:\n{_fence}\n{cell_str}\n"
 
-# %% ../nbs/02_shell.ipynb 92
+# %% ../nbs/02_shell.ipynb 93
 @call_parse
 def exec_nb(
     src:str, # Notebook path to read from
@@ -252,7 +254,7 @@ def exec_nb(
     CaptureShell().execute(src, dest, exc_stop=exc_stop, inject_code=inject_code,
                            inject_path=inject_path, inject_idx=inject_idx)
 
-# %% ../nbs/02_shell.ipynb 95
+# %% ../nbs/02_shell.ipynb 96
 class SmartCompleter(IPCompleter):
     def __init__(self, shell, namespace=None, jedi=False):
         if namespace is None: namespace = shell.user_ns
@@ -272,7 +274,7 @@ def __call__(self, c):
                     for o in self.completions(c, len(c))
                     if o.type not in ('magic', 'path')]
 
-# %% ../nbs/02_shell.ipynb 97
+# %% ../nbs/02_shell.ipynb 98
 @patch
 def complete(self:CaptureShell, c):
     if not hasattr(self, '_completer'): self._completer = SmartCompleter(self)

nbs/02_shell.ipynb

@@ -6,4 +6,4 @@ website:
   site-url: "https://fastai.github.io/execnb/"
   description: "A description of your project"
   repo-branch: master
-  repo-url: "https://github.com/fastai/execnb/tree/master/"
+  repo-url: "https://github.com/fastai/execnb/"

nbs/nbdev.yml

@@ -3,4 +3,4 @@ website:
     contents:
       - index.ipynb
       - 01_nbio.ipynb
-      - 02_shell.ipynb
+      - 02_shell.ipynb