nbdev 3.0.10__tar.gz → 3.0.12__tar.gz

{nbdev-3.0.10/nbdev.egg-info → nbdev-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.0.10
+Version: 3.0.12
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.10"
+__version__ = "3.0.12"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/_modidx.py

@@ -113,7 +113,8 @@ d = { 'settings': { 'branch': 'main',
                                    'nbdev.frontmatter._dict2fm': ('api/frontmatter.html#_dict2fm', 'nbdev/frontmatter.py'),
                                    'nbdev.frontmatter._fm2dict': ('api/frontmatter.html#_fm2dict', 'nbdev/frontmatter.py'),
                                    'nbdev.frontmatter._insertfm': ('api/frontmatter.html#_insertfm', 'nbdev/frontmatter.py'),
-                                   'nbdev.frontmatter._md2dict': ('api/frontmatter.html#_md2dict', 'nbdev/frontmatter.py')},
+                                   'nbdev.frontmatter._md2dict': ('api/frontmatter.html#_md2dict', 'nbdev/frontmatter.py'),
+                                   'nbdev.frontmatter.nb_frontmatter': ('api/frontmatter.html#nb_frontmatter', 'nbdev/frontmatter.py')},
             'nbdev.imports': {},
             'nbdev.maker': { 'nbdev.maker.ModuleMaker': ('api/maker.html#modulemaker', 'nbdev/maker.py'),
                              'nbdev.maker.ModuleMaker.__init__': ('api/maker.html#modulemaker.__init__', 'nbdev/maker.py'),

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/clean.py

@@ -205,7 +205,7 @@ def nbdev_install_hooks():
     hook_path = repo_path/'.git'/'hooks'
     fn = hook_path/'post-merge'
     hook_path.mkdir(parents=True, exist_ok=True)
-    fn.write_text("#!/bin/bash\nnbdev_trust")
+    fn.write_text("#!/bin/bash\nnbdev-trust")
     os.chmod(fn, os.stat(fn).st_mode | stat.S_IEXEC)
 
     cmd = 'git config --local include.path ../.gitconfig'
@@ -219,7 +219,7 @@ def nbdev_install_hooks():
 #
 [merge "nbdev-merge"]
 	name = resolve conflicts with nbdev_fix
-	driver = nbdev_merge %O %A %B %P
+	driver = nbdev-merge %O %A %B %P
 ''')
     run(cmd)
 

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/frontmatter.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/09_frontmatter.ipynb.
 
 # %% auto #0
-__all__ = ['FrontmatterProc']
+__all__ = ['nb_frontmatter', 'FrontmatterProc']
 
 # %% ../nbs/api/09_frontmatter.ipynb #2398f5ef-06d3-4890-8a54-7cf4f81f3894
 from .imports import *
@@ -22,6 +22,7 @@ _RE_FM_BASE=r'''^---\s*
 _re_fm_nb = re.compile(_RE_FM_BASE+'$', flags=re.DOTALL)
 _re_fm_md = re.compile(_RE_FM_BASE, flags=re.DOTALL)
 
+# %% ../nbs/api/09_frontmatter.ipynb #1725f3b9
 def _fm2dict(s:str, nb=True):
     "Load YAML frontmatter into a `dict`"
     re_fm = _re_fm_nb if nb else _re_fm_md
@@ -42,6 +43,15 @@ def _md2dict(s:str):
         except Exception as e: warn(f'Failed to create YAML dict for:\n{r}\n\n{e}\n')
     return res
 
+# %% ../nbs/api/09_frontmatter.ipynb #4ba11b21
+def nb_frontmatter(nb):
+    "Get frontmatter dict from `nb` without modifying cells"
+    raw = first(c for c in nb.cells if c.cell_type=='raw')
+    md  = first(c for c in nb.cells if c.cell_type=='markdown')
+    res = _md2dict(md.source) if md else {}
+    if raw: res.update(_fm2dict(raw.source))
+    return res
+
 # %% ../nbs/api/09_frontmatter.ipynb #1b5d9d32
 def _dict2fm(d): return f'---\n{yaml.dump(d)}\n---\n\n'
 def _insertfm(nb, fm): nb.cells.insert(0, mk_cell(_dict2fm(fm), 'raw'))

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/processors.py

@@ -47,8 +47,9 @@ class insert_warning(Processor):
 _def_types = (ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef)
 def _def_names(cell, shown):
     cellp = cell.parsed_()
-    return [showdoc_nm(o) for o in concat(cellp)
-            if isinstance(o,_def_types) and o.name not in shown and (o.name[0]!='_' or o.name[:2]=='__')] if cellp else []
+    nms = [showdoc_nm(o) for o in concat(cellp)
+           if isinstance(o,_def_types) and o.name not in shown and (o.name[0]!='_' or o.name[:2]=='__')] if cellp else []
+    return [n for nm in nms for n in (nm if isinstance(nm, list) else [nm])]
 
 def _get_nm(tree):
     i = tree.value.args[0]

{nbdev-3.0.10 → nbdev-3.0.12}/nbdev/test.py

@@ -17,7 +17,7 @@ from fastcore.meta import delegates
 from .config import *
 from .doclinks import *
 from .process import NBProcessor, nb_lang
-from .frontmatter import FrontmatterProc
+from .frontmatter import nb_frontmatter
 
 from execnb.nbio import *
 from execnb.shell import *
@@ -29,13 +29,14 @@ def test_nb(fn,  # file name of notebook to test
             do_print=False,  # print completion?
             showerr=True,  # print errors to stderr?
             basepath=None,  # path to add to sys.path
-            verbose=False):  # stream stdout/stderr from cells to console?
+            verbose=False,  # stream stdout/stderr from cells to console?
+            save=False):  # write outputs back to notebook on success?
     "Execute tests in notebook in `fn` except those with `skip_flags`"
     if basepath: sys.path.insert(0, str(basepath))
     if not IN_NOTEBOOK: os.environ["IN_TEST"] = '1'
     flags=set(L(skip_flags)) - set(L(force_flags))
-    nb = NBProcessor(fn, procs=FrontmatterProc, process=True).nb
-    fm = getattr(nb, 'frontmatter_', {})
+    nb = NBProcessor(fn, rm_directives=False, process=True).nb
+    fm = nb_frontmatter(nb)
     if str2bool(fm.get('skip_exec', False)) or nb_lang(nb) != 'python': return True, 0
 
     def _no_eval(cell):
@@ -51,6 +52,7 @@ def test_nb(fn,  # file name of notebook to test
     try:
         with working_directory(fn.parent):
             k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose)
+            if save: write_nb(nb, fn)
             res = True
     except: 
         if showerr: sys.stderr.write(k.prettytb(fname=fn)+'\n')
@@ -78,9 +80,11 @@ def nbdev_test(
     pause:float=0.01,  # Pause time (in seconds) between notebooks to avoid race conditions
     ignore_fname:str='.notest', # Filename that will result in siblings being ignored
     verbose:bool=False, # Print stdout/stderr from notebook cells?
+    save:bool=False, # Write outputs back to notebooks on success?
     **kwargs):
     "Test in parallel notebooks matching `path`, passing along `flags`"
     skip_flags = get_config().tst_flags
+    if isinstance(skip_flags, str): skip_flags = skip_flags.split()
     force_flags = flags.split()
     files = nbglob(path, as_path=True, **kwargs)
     files = [f.absolute() for f in sorted(files) if _keep_file(f, ignore_fname)]
@@ -92,7 +96,7 @@ def nbdev_test(
     wd_pth = get_config().nbs_path
     with working_directory(wd_pth if (wd_pth and wd_pth.exists()) else os.getcwd()):
         results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,
-                           basepath=get_config().config_path, pause=pause, do_print=do_print, verbose=verbose, **kw)
+                           basepath=get_config().config_path, pause=pause, do_print=do_print, verbose=verbose, save=save, **kw)
     passed,times = zip(*results)
     if all(passed): print("Success.")
     else: 

{nbdev-3.0.10 → nbdev-3.0.12/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.0.10
+Version: 3.0.12
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0