execnb 0.2.0__tar.gz → 0.2.2__tar.gz

{execnb-0.2.0/execnb.egg-info → execnb-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execnb
-Version: 0.2.0
+Version: 0.2.2
 Summary: A description of your project
 Author-email: Jeremy Howard <j@fast.ai>
 License: Apache-2.0
@@ -53,9 +53,9 @@ to run Jupyter code and capture notebook outputs, without running a
 Jupyter server (or even having it installed):
 
 ``` python
-from execnb.nbio import *
 from execnb.shell import *
 from fastcore.utils import *
+from fastcore.nbio import *
 ```
 
 ``` python
@@ -66,7 +66,7 @@ s.run('1+1')
     [{'data': {'text/plain': ['2']},
       'metadata': {},
       'output_type': 'execute_result',
-      'execution_count': 1}]
+      'execution_count': None}]
 
 To execute a notebook and save it with outputs filled in, use
 [`CaptureShell.execute`](https://AnswerDotAI.github.io/execnb/shell.html#captureshell.execute):
@@ -78,7 +78,7 @@ try:
 finally: Path('tmp.ipynb').unlink()
 ```
 
-    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': 3, 'metadata': {}, 'output_type': 'execute_result'}]
+    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': None, 'metadata': {}, 'output_type': 'execute_result'}]
 
 You can also execute notebooks from the command line with
 [`exec_nb`](https://AnswerDotAI.github.io/execnb/shell.html#exec_nb):
@@ -88,8 +88,7 @@ You can also execute notebooks from the command line with
 ```
 
     usage: exec_nb [-h] [--dest DEST] [--exc_stop] [--inject_code INJECT_CODE]
-                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX]
-                   [--verbose]
+                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX] [--verbose]
                    src
 
     Execute notebook from `src` and save with outputs to `dest`
@@ -97,11 +96,12 @@ You can also execute notebooks from the command line with
     positional arguments:
       src                        Notebook path to read from
 
-    optional arguments:
+    options:
       -h, --help                 show this help message and exit
       --dest DEST                Notebook path to write to (default: )
       --exc_stop                 Stop on exceptions? (default: False)
       --inject_code INJECT_CODE  Code to inject into a cell
       --inject_path INJECT_PATH  Path to file containing code to inject into a cell
       --inject_idx INJECT_IDX    Cell to replace with `inject_code` (default: 0)
-      --verbose                  Show stdout/stderr during execution (default: False)
+      --verbose                  Show stdout/stderr during execution (default:
+                                 False)

{execnb-0.2.0 → execnb-0.2.2}/README.md

@@ -28,9 +28,9 @@ to run Jupyter code and capture notebook outputs, without running a
 Jupyter server (or even having it installed):
 
 ``` python
-from execnb.nbio import *
 from execnb.shell import *
 from fastcore.utils import *
+from fastcore.nbio import *
 ```
 
 ``` python
@@ -41,7 +41,7 @@ s.run('1+1')
     [{'data': {'text/plain': ['2']},
       'metadata': {},
       'output_type': 'execute_result',
-      'execution_count': 1}]
+      'execution_count': None}]
 
 To execute a notebook and save it with outputs filled in, use
 [`CaptureShell.execute`](https://AnswerDotAI.github.io/execnb/shell.html#captureshell.execute):
@@ -53,7 +53,7 @@ try:
 finally: Path('tmp.ipynb').unlink()
 ```
 
-    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': 3, 'metadata': {}, 'output_type': 'execute_result'}]
+    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': None, 'metadata': {}, 'output_type': 'execute_result'}]
 
 You can also execute notebooks from the command line with
 [`exec_nb`](https://AnswerDotAI.github.io/execnb/shell.html#exec_nb):
@@ -63,8 +63,7 @@ You can also execute notebooks from the command line with
 ```
 
     usage: exec_nb [-h] [--dest DEST] [--exc_stop] [--inject_code INJECT_CODE]
-                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX]
-                   [--verbose]
+                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX] [--verbose]
                    src
 
     Execute notebook from `src` and save with outputs to `dest`
@@ -72,11 +71,12 @@ You can also execute notebooks from the command line with
     positional arguments:
       src                        Notebook path to read from
 
-    optional arguments:
+    options:
       -h, --help                 show this help message and exit
       --dest DEST                Notebook path to write to (default: )
       --exc_stop                 Stop on exceptions? (default: False)
       --inject_code INJECT_CODE  Code to inject into a cell
       --inject_path INJECT_PATH  Path to file containing code to inject into a cell
       --inject_idx INJECT_IDX    Cell to replace with `inject_code` (default: 0)
-      --verbose                  Show stdout/stderr during execution (default: False)
+      --verbose                  Show stdout/stderr during execution (default:
+                                 False)

execnb-0.2.2/execnb/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{execnb-0.2.0 → execnb-0.2.2}/execnb/shell.py

@@ -1,12 +1,12 @@
 """A shell for running notebook code without a notebook server"""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/02_shell.ipynb.
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_shell.ipynb.
 
 # %% auto #0
 __all__ = ['CaptureShell', 'format_exc', 'NbResult', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error',
            'exec_nb', 'SmartCompleter']
 
-# %% ../nbs/02_shell.ipynb #535003cf
+# %% ../nbs/00_shell.ipynb #535003cf
 from fastcore.utils import *
 from fastcore.script import call_parse
 from fastcore.ansi import ansi2html, strip_ansi
@@ -27,15 +27,12 @@ from IPython.display import display as disp, HTML
 
 from base64 import b64encode
 from html import escape
-try: from matplotlib_inline.backend_inline import set_matplotlib_formats
-except ImportError: set_matplotlib_formats = None
-
 
 from fastcore.nbio import *
 from fastcore.nbio import _dict2obj
 
 
-# %% ../nbs/02_shell.ipynb #6913382c
+# %% ../nbs/00_shell.ipynb #6913382c
 class _CustDisplayHook(DisplayHook):
     def write_output_prompt(self): pass
     def write_format_data(self, data, md_dict): pass
@@ -47,7 +44,7 @@ def __repr__(self: ExecutionInfo): return f'cell: {self.raw_cell}; id: {self.cel
 @patch
 def __repr__(self: ExecutionResult): return f'result: {self.result}; err: {self.error_in_exec}; info: <{self.info}>'
 
-# %% ../nbs/02_shell.ipynb #e3fb2bee
+# %% ../nbs/00_shell.ipynb #e3fb2bee
 class CaptureShell(InteractiveShell):
     displayhook_class = _CustDisplayHook
 
@@ -59,10 +56,13 @@ class CaptureShell(InteractiveShell):
         if path: self.set_path(path)
         self.display_formatter.active = True
         if not IN_NOTEBOOK: InteractiveShell._instance = self
-        if set_matplotlib_formats:
-            self.enable_matplotlib("inline")
-            self._run("from matplotlib_inline.backend_inline import set_matplotlib_formats")
-            self._run(f"set_matplotlib_formats('{mpl_format}')")
+        if mpl_format:
+            try: from matplotlib_inline.backend_inline import set_matplotlib_formats
+            except ImportError: set_matplotlib_formats = None
+            if set_matplotlib_formats:
+                self.enable_matplotlib("inline")
+                self._run("from matplotlib_inline.backend_inline import set_matplotlib_formats")
+                self._run(f"set_matplotlib_formats('{mpl_format}')")
 
     def _run(self, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
                  stdout=True, stderr=True, display=True, verbose=False):
@@ -73,16 +73,16 @@ class CaptureShell(InteractiveShell):
         return AttrDict(result=result, stdout='' if semic else c.stdout, stderr=c.stderr,
                         display_objects=c.outputs, 
                         exception=result.error_in_exec or result.error_before_exec, quiet=semic)
-    
+
     def set_path(self, path):
         "Add `path` to python path, or `path.parent` if it's a file"
         path = Path(path)
         if path.is_file(): path = path.parent
         self._run(f"import sys; sys.path.insert(0, '{path.as_posix()}')")
-    
+
     def enable_gui(self, gui=None): pass
 
-# %% ../nbs/02_shell.ipynb #93adf867
+# %% ../nbs/00_shell.ipynb #93adf867
 @patch
 def run_cell(self:CaptureShell, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
              stdout=True, stderr=True, display=True, timeout=None, verbose=False):
@@ -96,15 +96,15 @@ def run_cell(self:CaptureShell, raw_cell, store_history=False, silent=False, she
     finally:
         if timeout: signal.alarm(0)
 
-# %% ../nbs/02_shell.ipynb #a1eb7703
+# %% ../nbs/00_shell.ipynb #a1eb7703
 def format_exc(e):
     "Format exception `e` as a string list"
     return traceback.format_exception(type(e), e, e.__traceback__)
 
-# %% ../nbs/02_shell.ipynb #8ba0ae59
+# %% ../nbs/00_shell.ipynb #8ba0ae59
 class NbResult(list): pass
 
-# %% ../nbs/02_shell.ipynb #26bf9161
+# %% ../nbs/00_shell.ipynb #26bf9161
 def _out_stream(text, name): return dict(name=name, output_type='stream', text=text.splitlines(True))
 def _out_exc(e):
     ename = type(e).__name__
@@ -137,7 +137,7 @@ def _out_nb(o, fmt):
         if p["output_type"]=="execute_result": p['execution_count'] = o['execution_count']
     return res
 
-# %% ../nbs/02_shell.ipynb #242f732f
+# %% ../nbs/00_shell.ipynb #242f732f
 @patch
 def run(self:CaptureShell,
         code:str, # Python/IPython code to run
@@ -151,7 +151,7 @@ def run(self:CaptureShell,
     self.exc = res.exception
     return _out_nb(res, self.display_formatter)
 
-# %% ../nbs/02_shell.ipynb #eaa11df9
+# %% ../nbs/00_shell.ipynb #eaa11df9
 @patch
 async def run_async(self:CaptureShell,
         code: str,  # Python/IPython code to run
@@ -161,7 +161,7 @@ async def run_async(self:CaptureShell,
         verbose:bool=False): # Show stdout/stderr during execution
     return self.run(code, stdout=stdout, stderr=stderr, timeout=timeout, verbose=verbose)
 
-# %% ../nbs/02_shell.ipynb #f698a432
+# %% ../nbs/00_shell.ipynb #f698a432
 def _pre(s, xtra=''): return f"<pre {xtra}><code>{escape(s)}</code></pre>"
 def _strip(s): return strip_ansi(escape(s))
 
@@ -196,7 +196,7 @@ def render_outputs(outputs, ansi_renderer=_strip, include_imgs=True, pygments=Fa
 
     return '\n'.join(map(render_output, outputs))
 
-# %% ../nbs/02_shell.ipynb #c6176b9e
+# %% ../nbs/00_shell.ipynb #c6176b9e
 @patch
 def cell(self:CaptureShell, cell, stdout=True, stderr=True, verbose=False):
     "Run `cell`, skipping if not code, and store outputs back in cell"
@@ -205,32 +205,32 @@ def cell(self:CaptureShell, cell, stdout=True, stderr=True, verbose=False):
     outs = self.run(cell.source, verbose=verbose)
     if outs: cell.outputs = _dict2obj(outs)
 
-# %% ../nbs/02_shell.ipynb #008c0cef
+# %% ../nbs/00_shell.ipynb #008c0cef
 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 #6e677414
+# %% ../nbs/00_shell.ipynb #6e677414
 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 #c7352a2b
+# %% ../nbs/00_shell.ipynb #c7352a2b
 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 #7d52326c
+# %% ../nbs/00_shell.ipynb #7d52326c
 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 #60a25f27
+# %% ../nbs/00_shell.ipynb #60a25f27
 def _false(o): return False
 
 @patch
@@ -251,7 +251,7 @@ def run_all(self:CaptureShell,
             postproc(cell)
         if self.exc and exc_stop: raise self.exc from None
 
-# %% ../nbs/02_shell.ipynb #70808010
+# %% ../nbs/00_shell.ipynb #70808010
 @patch
 def execute(self:CaptureShell,
             src:str|Path, # Notebook path to read from
@@ -273,7 +273,7 @@ def execute(self:CaptureShell,
                  inject_code=inject_code, inject_idx=inject_idx, verbose=verbose)
     if dest: write_nb(nb, dest)
 
-# %% ../nbs/02_shell.ipynb #694161cb
+# %% ../nbs/00_shell.ipynb #694161cb
 @patch
 def prettytb(self:CaptureShell, 
              fname:str|Path=None): # filename to print alongside the traceback
@@ -285,7 +285,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 #1227c8b1
+# %% ../nbs/00_shell.ipynb #1227c8b1
 @call_parse
 def exec_nb(
     src:str, # Notebook path to read from
@@ -300,7 +300,7 @@ def exec_nb(
     CaptureShell().execute(src, dest, exc_stop=exc_stop, inject_code=inject_code,
                            inject_path=inject_path, inject_idx=inject_idx, verbose=verbose)
 
-# %% ../nbs/02_shell.ipynb #c44963a0
+# %% ../nbs/00_shell.ipynb #c44963a0
 class SmartCompleter(IPCompleter):
     def __init__(self, shell, namespace=None, jedi=False):
         if namespace is None: namespace = shell.user_ns
@@ -320,7 +320,7 @@ class SmartCompleter(IPCompleter):
         if res and res[0][-1]=='=': res = [o for o in res if o[-1]=='=']
         return res
 
-# %% ../nbs/02_shell.ipynb #7d7c852c
+# %% ../nbs/00_shell.ipynb #7d7c852c
 @patch
 def complete(self:CaptureShell, c):
     if not hasattr(self, '_completer'): self._completer = SmartCompleter(self)

{execnb-0.2.0 → execnb-0.2.2/execnb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execnb
-Version: 0.2.0
+Version: 0.2.2
 Summary: A description of your project
 Author-email: Jeremy Howard <j@fast.ai>
 License: Apache-2.0
@@ -53,9 +53,9 @@ to run Jupyter code and capture notebook outputs, without running a
 Jupyter server (or even having it installed):
 
 ``` python
-from execnb.nbio import *
 from execnb.shell import *
 from fastcore.utils import *
+from fastcore.nbio import *
 ```
 
 ``` python
@@ -66,7 +66,7 @@ s.run('1+1')
     [{'data': {'text/plain': ['2']},
       'metadata': {},
       'output_type': 'execute_result',
-      'execution_count': 1}]
+      'execution_count': None}]
 
 To execute a notebook and save it with outputs filled in, use
 [`CaptureShell.execute`](https://AnswerDotAI.github.io/execnb/shell.html#captureshell.execute):
@@ -78,7 +78,7 @@ try:
 finally: Path('tmp.ipynb').unlink()
 ```
 
-    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': 3, 'metadata': {}, 'output_type': 'execute_result'}]
+    [{'name': 'stdout', 'output_type': 'stream', 'text': ['1\n']}, {'data': {'text/plain': ['2']}, 'execution_count': None, 'metadata': {}, 'output_type': 'execute_result'}]
 
 You can also execute notebooks from the command line with
 [`exec_nb`](https://AnswerDotAI.github.io/execnb/shell.html#exec_nb):
@@ -88,8 +88,7 @@ You can also execute notebooks from the command line with
 ```
 
     usage: exec_nb [-h] [--dest DEST] [--exc_stop] [--inject_code INJECT_CODE]
-                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX]
-                   [--verbose]
+                   [--inject_path INJECT_PATH] [--inject_idx INJECT_IDX] [--verbose]
                    src
 
     Execute notebook from `src` and save with outputs to `dest`
@@ -97,11 +96,12 @@ You can also execute notebooks from the command line with
     positional arguments:
       src                        Notebook path to read from
 
-    optional arguments:
+    options:
       -h, --help                 show this help message and exit
       --dest DEST                Notebook path to write to (default: )
       --exc_stop                 Stop on exceptions? (default: False)
       --inject_code INJECT_CODE  Code to inject into a cell
       --inject_path INJECT_PATH  Path to file containing code to inject into a cell
       --inject_idx INJECT_IDX    Cell to replace with `inject_code` (default: 0)
-      --verbose                  Show stdout/stderr during execution (default: False)
+      --verbose                  Show stdout/stderr during execution (default:
+                                 False)

execnb-0.2.0/execnb/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"