execnb 0.1.12__tar.gz → 0.1.13__tar.gz

{execnb-0.1.12/execnb.egg-info → execnb-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: execnb
-Version: 0.1.12
+Version: 0.1.13
 Summary: A description of your project
 Home-page: https://github.com/AnswerDotAI/execnb/
 Author: Jeremy Howard
@@ -22,6 +22,19 @@ Provides-Extra: dev
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: Pillow; extra == "dev"
 Requires-Dist: mistletoe; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # execnb
 

execnb-0.1.13/execnb/__init__.py

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

{execnb-0.1.12 → execnb-0.1.13}/execnb/_modidx.py

@@ -1,6 +1,6 @@
 # Autogenerated by nbdev
 
-d = { 'settings': { 'branch': 'master',
+d = { 'settings': { 'branch': 'main',
                 'doc_baseurl': '/execnb/',
                 'doc_host': 'https://AnswerDotAI.github.io',
                 'git_url': 'https://github.com/AnswerDotAI/execnb/',
@@ -35,6 +35,7 @@ d = { 'settings': { 'branch': 'master',
                               'execnb.shell.CaptureShell.set_path': ('shell.html#captureshell.set_path', 'execnb/shell.py'),
                               'execnb.shell.ExecutionInfo.__repr__': ('shell.html#executioninfo.__repr__', 'execnb/shell.py'),
                               'execnb.shell.ExecutionResult.__repr__': ('shell.html#executionresult.__repr__', 'execnb/shell.py'),
+                              'execnb.shell.NbResult': ('shell.html#nbresult', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter': ('shell.html#smartcompleter', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter.__call__': ('shell.html#smartcompleter.__call__', 'execnb/shell.py'),
                               'execnb.shell.SmartCompleter.__init__': ('shell.html#smartcompleter.__init__', 'execnb/shell.py'),

{execnb-0.1.12 → execnb-0.1.13}/execnb/shell.py

@@ -34,8 +34,8 @@ from .nbio import _dict2obj
 
 
 # %% auto 0
-__all__ = ['CaptureShell', 'format_exc', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error', 'exec_nb',
-           'SmartCompleter']
+__all__ = ['CaptureShell', 'format_exc', 'NbResult', 'render_outputs', 'find_output', 'out_exec', 'out_stream', 'out_error',
+           'exec_nb', 'SmartCompleter']
 
 # %% ../nbs/02_shell.ipynb
 class _CustDisplayHook(DisplayHook):
@@ -102,6 +102,9 @@ def format_exc(e):
     "Format exception `e` as a string list"
     return traceback.format_exception(type(e), e, e.__traceback__)
 
+# %% ../nbs/02_shell.ipynb
+class NbResult(list): pass
+
 # %% ../nbs/02_shell.ipynb
 def _out_stream(text, name): return dict(name=name, output_type='stream', text=text.splitlines(True))
 def _out_exc(e):
@@ -122,13 +125,15 @@ def _mk_out(data, meta, output_type='display_data'):
     return dict(data=fd, metadata=meta, output_type=output_type)
 
 def _out_nb(o, fmt):
-    res = []
+    res = NbResult()
     if o.stdout: res.append(_out_stream(o.stdout, 'stdout'))
     if o.stderr: res.append(_out_stream(o.stderr, 'stderr'))
     if o.exception: res.append(_out_exc(o.exception))
     r = o.result.result
+    if hasattr(r, '__ft__'): r = r.__ft__()
+    res.result = r
     for x in o.display_objects: res.append(_mk_out(x.data, x.metadata))
-    if r is not None and not o.quiet:
+    if r is not None and not o.quiet and not isinstance_str(r, 'FT'):
         res.append(_mk_out(*fmt.format(r), 'execute_result'))
     if 'execution_count' not in o: o['execution_count']=None
     for p in res:
@@ -185,8 +190,8 @@ def render_outputs(outputs, ansi_renderer=_strip, include_imgs=True, pygments=Fa
             if include_imgs:
                 if d := _g('image/jpeg'): return f'<img src="data:image/jpeg;base64,{d}"/>'
                 if d := _g('image/png'): return f'<img src="data:image/png;base64,{d}"/>'
+                if d := _g('image/svg+xml'): return d
             if d := _g('text/plain'): return _pre(d)
-            if d := _g('image/svg+xml'): return d
             
         return ''
 

{execnb-0.1.12 → execnb-0.1.13/execnb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: execnb
-Version: 0.1.12
+Version: 0.1.13
 Summary: A description of your project
 Home-page: https://github.com/AnswerDotAI/execnb/
 Author: Jeremy Howard
@@ -22,6 +22,19 @@ Provides-Extra: dev
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: Pillow; extra == "dev"
 Requires-Dist: mistletoe; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # execnb
 

execnb-0.1.13/pyproject.toml

@@ -0,0 +1,11 @@
+[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name="execnb"
+requires-python=">=3.7"
+dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]

{execnb-0.1.12 → execnb-0.1.13}/settings.ini

@@ -8,8 +8,8 @@ keywords = some keywords
 user = AnswerDotAI
 author = Jeremy Howard
 author_email = j@fast.ai
-branch = master
-version = 0.1.12
+branch = main
+version = 0.1.13
 min_python = 3.7
 requirements = fastcore>=1.5.5 ipython
 dev_requirements = matplotlib Pillow mistletoe

execnb-0.1.12/execnb/__init__.py

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

execnb-0.1.12/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=64.0"]
-build-backend = "setuptools.build_meta"