nbdev 2.4.8__py3-none-any.whl → 2.4.11__py3-none-any.whl

nbdev/doclinks.py

@@ -2,10 +2,10 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/05_doclinks.ipynb.
 
-# %% auto 0
+# %% auto #0
 __all__ = ['typs', 'bset', 'patch_name', 'nbglob', 'nbglob_cli', 'nbdev_export', 'create_index', 'NbdevLookup']
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #6476cba7
 from .config import *
 from .maker import *
 from .export import *
@@ -29,7 +29,7 @@ from types import ModuleType
 
 from importlib.metadata import entry_points
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #a53fc2bb
 def _sym_nm(klas, sym): return f'{unparse(klas).strip()}.{sym.name}'
 
 def _binop_leafs(bo, o):
@@ -50,32 +50,30 @@ def patch_name(o):
     else: return o.name
     return _sym_nm(a,o)
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #7552f6c8
 def _iter_py_cells(p):
     "Yield cells from an exported Python file."
     p = Path(p)
     cells = p.read_text(encoding='utf-8').split("\n# %% ")
-    has_cell_number = get_config().cell_number
     for cell in cells[1:]:
         top,code = cell.split('\n', 1)
-        try:
-            if has_cell_number:
-                *nb,idx = top.split()
-                nb = ' '.join(nb)
-                idx = int(idx)
-            else:
-                nb = top
-                idx = None
-        except ValueError: raise ValueError(f"Unexpected format in '{p}' at cell:\n```\n# %% {cell.strip()}.\n```\n"
-                                            "The expected format is: '# %% {nb_path} {cell_idx}'.")
-        nb_path = None if nb=='auto' else (p.parent/nb).resolve()  # NB paths are stored relative to .py file
+        parts = top.split()
+        # Format: "path/to/nb.ipynb #cell_id"
+        if len(parts) >= 2 and parts[-1].startswith('#'):
+            cell_id = parts[-1][1:]  # Remove the '#' prefix
+            nb = ' '.join(parts[:-1])
+        else:
+            raise ValueError(f"Cell ID required but not found in '{p}' at:\n```\n# %% {top}\n```\n"
+                           "Run `nbdev_export` to regenerate .py files with cell IDs.")
+        if nb=='auto': continue  # Skip auto-generated __all__ cell
+        nb_path = (p.parent/nb).resolve()  # NB paths are stored relative to .py file
         if code.endswith('\n'): code=code[:-1]
-        yield AttrDict(nb=nb, idx=idx, code=code, nb_path=nb_path, py_path=p.resolve())
+        yield AttrDict(nb=nb, cell_id=cell_id, code=code, nb_path=nb_path, py_path=p.resolve())
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #d1c22276
 def _nbpath2html(p): return p.with_name(re.sub(r'^\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html')
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #f57b8709
 def _get_modidx(py_path, code_root, nbs_path):
     "Get module symbol index for a Python source file"
     cfg = get_config()
@@ -97,7 +95,7 @@ def _get_modidx(py_path, code_root, nbs_path):
                     if isinstance(t2, _def_types): _stor(f'{tree.name}.{t2.name}')
     return {mod_name: d}
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #587df0d4
 def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     "Create _modidx.py"
     if dest is None: dest = get_config().lib_path
@@ -117,7 +115,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
         except ValueError: pass
     idxfile.write_text("# Autogenerated by nbdev\n\nd = "+pformat(res, width=140, indent=2, compact=True)+'\n')
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #0b3e1605
 @delegates(globtastic)
 def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_re='^[_.]', key='nbs_path', as_path=False, **kwargs):
     "Find all files in a directory matching an extension given a config key."
@@ -127,7 +125,7 @@ def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_r
                      skip_file_re=skip_file_re, recursive=recursive, **kwargs)
     return res.map(Path) if as_path else res
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #f0922957
 def nbglob_cli(
     path:str=None, # Path to notebooks
     symlinks:bool=False, # Follow symlinks?
@@ -141,7 +139,7 @@ def nbglob_cli(
     return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,
                   skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re)
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #5e6fbe08
 @call_parse
 @delegates(nbglob_cli)
 def nbdev_export(
@@ -159,11 +157,11 @@ def nbdev_export(
     add_init(get_config().lib_path)
     _build_modidx()
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #3134c22b
 typs = 'module','class','method','function'
 bset = set(dir(builtins))
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #f5fceca8
 def create_index(url, pre=None):
     "Create a documentation index from a sphinx inventory file at `url`, with optional prefix `pre`"
     try: from sphinx.util.inventory import InventoryFile
@@ -181,11 +179,11 @@ def create_index(url, pre=None):
             if modparts: syms['.'.join(modparts)][k] = v
     return syms
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #98a6ee7a
 import importlib,ast
 from functools import lru_cache
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #c30ec2fe
 def _find_mod(mod):
     mp,_,mr = mod.partition('/')
     spec = importlib.util.find_spec(mp)
@@ -209,7 +207,7 @@ def _get_exps(mod):
 
 def _lineno(sym, fname): return _get_exps(fname).get(sym, None) if fname else None
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #c1b8c9fa
 def _qual_sym(s, settings):
     "Get qualified nb, py, and github paths for a symbol s"
     if not isinstance(s,tuple): return s
@@ -225,10 +223,10 @@ def _qual_syms(entries):
     if 'doc_host' not in settings: return entries
     return {'syms': {mod:_qual_mod(d, settings) for mod,d in entries['syms'].items()}, 'settings':settings}
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #53505fa4
 _re_backticks = re.compile(r'`([^`\s]+?)(?:\(\))?`')
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #3a24b883
 @lru_cache(None)
 def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
     cfg = get_config()
@@ -260,7 +258,7 @@ def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
             py_syms = merge(stripped, py_syms)
     return entries,py_syms
 
-# %% ../nbs/api/05_doclinks.ipynb
+# %% ../nbs/api/05_doclinks.ipynb #3257b6bf
 class NbdevLookup:
     "Mapping from symbol names to docs and source URLs"
     def __init__(self, strip_libs=None, incl_libs=None, skip_mods=None, ns=None):

nbdev/export.py

@@ -2,10 +2,10 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/04_export.ipynb.
 
-# %% auto 0
+# %% auto #0
 __all__ = ['ExportModuleProc', 'black_format', 'scrub_magics', 'optional_procs', 'nb_export']
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #3b932371
 from .config import *
 from .maker import *
 from .imports import *
@@ -18,7 +18,7 @@ from fastcore.meta import *
 
 from collections import defaultdict
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #a62f3967
 class ExportModuleProc:
     "A processor which exports code to a module"
     def begin(self): self.modules,self.in_all = defaultdict(L),defaultdict(L)
@@ -33,7 +33,7 @@ class ExportModuleProc:
         if cell.cell_type=='markdown' and src.startswith('# '): self.modules['#'].append(cell)
     _exports_=_export_
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #6f524839
 def black_format(cell, # Cell to format
                  force=False): # Turn black formatting on regardless of settings.ini
     "Processor to format code with `black`"
@@ -47,7 +47,7 @@ def black_format(cell, # Cell to format
         try: cell.source = _format_str(cell.source).strip()
         except: pass
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #aed6a875
 # includes the newline, because calling .strip() would affect all cells.
 _magics_pattern = re.compile(r'^\s*(%%|%).*\n?', re.MULTILINE)
 
@@ -59,14 +59,14 @@ def scrub_magics(cell): # Cell to format
     try: cell.source = _magics_pattern.sub('', cell.source)
     except: pass
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #d4a5fd8c
 import nbdev.export
 def optional_procs():
     "An explicit list of processors that could be used by `nb_export`"
     return L([p for p in nbdev.export.__all__
               if p not in ["nb_export", "nb_export_cli", "ExportModuleProc", "optional_procs"]])
 
-# %% ../nbs/api/04_export.ipynb
+# %% ../nbs/api/04_export.ipynb #76717e36
 def nb_export(nbname:str,        # Filename of notebook 
               lib_path:str=None, # Path to destination library.  If not in a nbdev project, defaults to current directory.
               procs=None,        # Processors to use

nbdev/frontmatter.py

@@ -2,10 +2,10 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/09_frontmatter.ipynb.
 
-# %% auto 0
+# %% auto #0
 __all__ = ['FrontmatterProc']
 
-# %% ../nbs/api/09_frontmatter.ipynb
+# %% ../nbs/api/09_frontmatter.ipynb #2398f5ef-06d3-4890-8a54-7cf4f81f3894
 from .imports import *
 from .process import *
 from .doclinks import _nbpath2html
@@ -14,7 +14,7 @@ from execnb.nbio import *
 from fastcore.imports import *
 import yaml
 
-# %% ../nbs/api/09_frontmatter.ipynb
+# %% ../nbs/api/09_frontmatter.ipynb #6d13ecdb
 _RE_FM_BASE=r'''^---\s*
 (.*?\S+.*?)
 ---\s*'''
@@ -42,7 +42,7 @@ 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
+# %% ../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/maker.py

@@ -2,13 +2,13 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/02_maker.ipynb.
 
-# %% ../nbs/api/02_maker.ipynb 1
+# %% ../nbs/api/02_maker.ipynb #aac32462
 from __future__ import annotations
 
-# %% auto 0
+# %% auto #0
 __all__ = ['find_var', 'read_var', 'update_var', 'ModuleMaker', 'decor_id', 'make_code_cells', 'relative_import', 'update_import']
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #ae4d461b
 from .config import *
 from .imports import *
 
@@ -23,7 +23,7 @@ from collections import defaultdict
 from pprint import pformat
 from textwrap import TextWrapper
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #c2d38766
 def find_var(lines, varname):
     "Find the line numbers where `varname` is defined in `lines`"
     start = first(i for i,o in enumerate(lines) if o.startswith(varname))
@@ -33,7 +33,7 @@ def find_var(lines, varname):
     end = first(i for i,o in enumerate(lines[start+1:]) if o[:1] not in empty)
     return start,len(lines) if end is None else (end+start+1)
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #b231d55b
 def read_var(code, varname):
     "Eval and return the value of `varname` defined in `code`"
     lines = code.splitlines()
@@ -44,7 +44,7 @@ def read_var(code, varname):
     try: return eval('\n'.join(res))
     except SyntaxError: raise Exception('\n'.join(res)) from None
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #be8307b0
 def update_var(varname, func, fn=None, code=None):
     "Update the definition of `varname` in file `fn`, by calling `func` with the current definition"
     if fn:
@@ -60,7 +60,7 @@ def update_var(varname, func, fn=None, code=None):
     if fn: fn.write_text(code)
     else: return code
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #a676a7ea
 class ModuleMaker:
     "Helper class to create exported library from notebook source cells"
     def __init__(self, dest, name, nb_path, is_new=True, parse=True, solo_nb=False):
@@ -72,12 +72,12 @@ class ModuleMaker:
         self.dest2nb = nb_path.relpath(self.fname.parent).as_posix()
         self.hdr = f"# %% {self.dest2nb}"
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #e87fd7a3
 def decor_id(d):
     "`id` attr of decorator, regardless of whether called as function or bare"
     return d.id if hasattr(d, 'id') else nested_attr(d, 'func.id', '')
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #31c81084
 _def_types = ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef
 _assign_types = ast.AnnAssign, ast.Assign, ast.AugAssign
 
@@ -88,7 +88,7 @@ def _all_targets(a): return L(getattr(a,'elts',a))
 def _filt_dec(x): return decor_id(x).startswith('patch')
 def _wants(o): return isinstance(o,_def_types) and not any(L(o.decorator_list).filter(_filt_dec))
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #59156e51
 def _targets(o): return [o.target] if isinstance(o, (ast.AugAssign,ast.AnnAssign)) else o.targets
 
 @patch
@@ -107,10 +107,10 @@ def make_all(self:ModuleMaker, cells):
     exports = (assign_targs.attrgot('id')+syms).filter(lambda o: o and o[0]!='_')
     return (exports+all_vals).unique()
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #ea782f32
 def make_code_cells(*ss): return dict2nb({'cells':L(ss).map(mk_cell)}).cells
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #a2546836
 def relative_import(name, fname, level=0):
     "Convert a module `name` to a name relative to `fname`"
     assert not level
@@ -122,7 +122,7 @@ def relative_import(name, fname, level=0):
     if not all(o=='.' for o in res): res='.'+res
     return res.replace(os.path.sep, ".")
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #d031e0e0
 # Based on https://github.com/thonny/thonny/blob/master/thonny/ast_utils.py
 def _mark_text_ranges(
     source: str|bytes, # Source code to add ranges to
@@ -140,7 +140,7 @@ def _mark_text_ranges(
             child.end_lineno, child.end_col_offset = child.lineno, child.col_offset+2
     return root.body
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #655d3b95
 def update_import(source, tree, libname, f=relative_import):
     if not tree: return
     if sys.version_info < (3,8): tree = _mark_text_ranges(source)
@@ -160,7 +160,7 @@ def import2relative(cell:NbCell, libname):
     src = update_import(cell.source, cell.parsed_(), libname)
     if src: cell.set_source(src)
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #c9e055fe
 @patch
 def _last_future(self:ModuleMaker, cells):
     "Returns the location of a `__future__` in `cells`"
@@ -169,13 +169,13 @@ def _last_future(self:ModuleMaker, cells):
          isinstance(t,ast.ImportFrom) and t.module=='__future__' for t in tree))+1
     except ValueError: return 0
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #8b552b48
 def _import2relative(cells, lib_path=None):
     "Converts `cells` to use `import2relative` based on `lib_path`"
     if lib_path is None: lib_path = get_config().lib_path
     for cell in cells: cell.import2relative(lib_path)
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #5bff9d71
 def _retr_mdoc(cells):
     "Search for md meta quote line, used to create module docstring"
     md1 = first(o for o in cells if o.cell_type=='markdown' and o.source.startswith('# '))
@@ -185,7 +185,7 @@ def _retr_mdoc(cells):
     summ = summ.lstrip('> ').strip()
     return f'"""{summ}"""\n\n' if summ else ''
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #cdd205d6
 @patch
 def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
     "Write module containing `cells` with `__all__` generated from `all_cells`"
@@ -208,11 +208,11 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
         f.write(_retr_mdoc(cells))
         f.write(f"# AUTOGENERATED! DO NOT EDIT! File to edit: {self.dest2nb}.")
         if last_future > 0: write_cells(cells[:last_future], self.hdr, f)
-        if self.parse and not self.solo_nb: f.write(f"\n\n# %% auto 0\n__all__ = {all_str}")
-        write_cells(cells[last_future:], self.hdr, f, cell_number=get_config().cell_number, solo_nb=self.solo_nb)
+        if self.parse and not self.solo_nb: f.write(f"\n\n# %% auto #0\n__all__ = {all_str}")
+        write_cells(cells[last_future:], self.hdr, f, solo_nb=self.solo_nb)
         f.write('\n')
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #6515a9d7
 @patch
 def _update_all(self:ModuleMaker, all_cells, alls):
     return pformat(alls + self.make_all(all_cells), width=160)
@@ -224,7 +224,7 @@ def _make_exists(self:ModuleMaker, cells, all_cells=None):
         update_var('__all__', partial(self._update_all, all_cells), fn=self.fname)
     with self.fname.open('a', encoding="utf-8") as f: write_cells(cells, self.hdr, f)
 
-# %% ../nbs/api/02_maker.ipynb
+# %% ../nbs/api/02_maker.ipynb #63c95e1e
 def _basic_export_nb2(fname, name, dest=None):
     "A basic exporter to bootstrap nbdev using `ModuleMaker`"
     if dest is None: dest = get_config().lib_path

nbdev/merge.py

@@ -2,10 +2,10 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/07_merge.ipynb.
 
-# %% auto 0
+# %% auto #0
 __all__ = ['conf_re', 'unpatch', 'nbdev_fix', 'nbdev_merge']
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #f2c8f7ea
 from .imports import *
 from .config import *
 from .export import *
@@ -18,7 +18,7 @@ from fastcore import shutil
 import subprocess
 from difflib import SequenceMatcher
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #b496277c
 _BEG,_MID,_END = '<'*7,'='*7,'>'*7
 conf_re = re.compile(rf'^{_BEG}\s+(\S+)\n(.*?)^{_MID}\n(.*?)^{_END}\s+([\S ]+)\n', re.MULTILINE|re.DOTALL)
 
@@ -28,7 +28,7 @@ def _unpatch_f(before, cb1, cb2, c, r):
     r.append(c)
     return cb2
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #92a460f3
 def unpatch(s:str):
     "Takes a string with conflict markers and returns the two original files, and their branch names"
     *main,last = conf_re.split(s)
@@ -38,7 +38,7 @@ def unpatch(s:str):
         c2b = _unpatch_f(before, c2b, c2_branch, c2, r2)
     return ''.join(r1+[last]), ''.join(r2+[last]), c1b, c2b
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #35ff58e3
 def _make_md(code): return [dict(source=f'`{code}`', cell_type="markdown", metadata={})]
 def _make_conflict(a,b, branch1, branch2):
     return _make_md(f'{_BEG} {branch1}') + a+_make_md(_MID)+b + _make_md(f'{_END} {branch2}')
@@ -55,7 +55,7 @@ def _merge_cells(a, b, brancha, branchb, theirs):
         prev_sa,prev_sb = sa+sz,sb+sz
     return res,conflict
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #cc492d30
 @call_parse
 def nbdev_fix(nbname:str, # Notebook filename to fix
                outname:str=None, # Filename of output notebook (defaults to `nbname`)
@@ -77,12 +77,12 @@ def nbdev_fix(nbname:str, # Notebook filename to fix
         else: print("Successfully merged conflicts!")
     return conflict
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #481a6bdf
 def _git_branch_merge():
     try: return only(v for k,v in os.environ.items() if k.startswith('GITHEAD'))
     except ValueError: return
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #801ba5a9
 def _git_rebase_head():
     for d in ('apply','merge'):
         d = Path(f'.git/rebase-{d}')
@@ -91,14 +91,14 @@ def _git_rebase_head():
             msg = run(f'git show-branch --no-name {cmt}')
             return f'{cmt[:7]} ({msg})'
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #a39cf098
 def _git_merge_file(base, ours, theirs):
     "`git merge-file` with expected labels depending on if a `merge` or `rebase` is in-progress"
     l_theirs = _git_rebase_head() or _git_branch_merge() or 'THEIRS'
     cmd = f"git merge-file -L HEAD -L BASE -L '{l_theirs}' {ours} {base} {theirs}"
     return subprocess.run(cmd, shell=True, capture_output=True, text=True)
 
-# %% ../nbs/api/07_merge.ipynb
+# %% ../nbs/api/07_merge.ipynb #40796199
 @call_parse
 def nbdev_merge(base:str, ours:str, theirs:str, path:str):
     "Git merge driver for notebooks"

nbdev/migrate.py

@@ -2,10 +2,10 @@
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/16_migrate.ipynb.
 
-# %% auto 0
+# %% auto #0
 __all__ = ['MigrateProc', 'fp_md_fm', 'migrate_nb', 'migrate_md', 'nbdev_migrate']
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #5b687fa0-dc50-48df-8bfc-e98df34e7572
 from .process import *
 from .frontmatter import *
 from .frontmatter import _fm2dict, _re_fm_md, _dict2fm, _insertfm
@@ -16,20 +16,20 @@ from .showdoc import show_doc
 from fastcore.all import *
 import shutil
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #52f60fb5-bc54-474a-876c-9146dd092681
 def _cat_slug(fmdict):
     "Get the partial slug from the category front matter."
     slug = '/'.join(fmdict.get('categories', ''))
     return '/' + slug if slug else '' 
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #9fac0338-a503-4680-984f-60153843d5ef
 def _file_slug(fname): 
     "Get the partial slug from the filename."
     p = Path(fname)
     dt = '/'+p.name[:10].replace('-', '/')+'/'
     return dt + p.stem[11:]    
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #689bf354
 def _replace_fm(d:dict, # dictionary you wish to conditionally change
                 k:str,  # key to check 
                 val:str,# value to check if d[k] == v
@@ -47,14 +47,14 @@ def _fp_fm(d):
     d = _replace_fm(d, 'hide', 'true', {'draft': 'true'})
     return d
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #3146ce27
 def _fp_image(d):
     "Correct path of fastpages images to reference the local directory."
     prefix = 'images/copied_from_nb/'
     if d.get('image', '').startswith(prefix): d['image'] = d['image'].replace(prefix, '')
     return d
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #244b0d01-a166-4549-9a45-1f8b1195c3c8
 def _rm_quote(s): 
     title = re.search('''"(.*?)"''', s)
     return title.group(1) if title else s
@@ -81,7 +81,7 @@ def _fp_convert(fm:dict, path:Path):
     if fm.get('comments'): fm.pop('comments') #true by itself is not a valid value for comments https://quarto.org/docs/output-formats/html-basics.html#commenting, and the default is true
     return fm
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #c8440f8b-f69e-44d2-8556-8869c1eedf0f
 class MigrateProc(Processor):
     "Migrate fastpages front matter in notebooks to a raw cell."
     def begin(self): 
@@ -89,7 +89,7 @@ class MigrateProc(Processor):
         if getattr(first(self.nb.cells), 'cell_type', None) == 'raw': del self.nb.cells[0]
         _insertfm(self.nb, self.nb.frontmatter_)
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #d5d575f3-b3b8-487d-8740-b1ebdccf6b34
 def fp_md_fm(path):
     "Make fastpages front matter in markdown files quarto compliant."
     p = Path(path)
@@ -100,12 +100,12 @@ def fp_md_fm(path):
         return _re_fm_md.sub(_dict2fm(fm), md)
     else: return md 
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #1abf7dc6-4a01-4c44-bdc3-0147820091ca
 _alias = merge({k:'code-fold: true' for k in ['collapse', 'collapse_input', 'collapse_hide']}, 
                {'collapse_show':'code-fold: show', 'hide_input': 'echo: false', 'hide': 'include: false', 'hide_output': 'output: false'})
 def _subv1(s): return _alias.get(s, s)
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #0dde9fe8-d3ad-47b8-bd87-85b9536e9f96
 def _re_v1():
     d = ['default_exp', 'export', 'exports', 'exporti', 'hide', 'hide_input', 'collapse_show', 'collapse',
          'collapse_hide', 'collapse_input', 'hide_output',  'default_cls_lvl']
@@ -118,7 +118,7 @@ def _repl_directives(code_str):
     def _fmt(x): return f"#| {_subv1(x[2].replace('-', '_').strip())}"
     return _re_v1().sub(_fmt, code_str)
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #cddcad93-1e44-4cbe-8dbd-9538533d0f8e
 def _repl_v1dir(cell):
     "Replace nbdev v1 with v2 directives."
     if cell.get('source') and cell.get('cell_type') == 'code':
@@ -128,21 +128,21 @@ def _repl_v1dir(cell):
         if not ss: pass
         else: cell['source'] = '\n'.join([_repl_directives(c) for c in ss[:first_code]] + ss[first_code:])
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #e99a0998-cbfc-46ca-a068-5695437ebc5a
 _re_callout = re.compile(r'^>\s(Warning|Note|Important|Tip):(.*)', flags=re.MULTILINE)
 def _co(x): return ":::{.callout-"+x[1].lower()+"}\n\n" + f"{x[2].strip()}\n\n" + ":::"
 def _convert_callout(s): 
     "Convert nbdev v1 to v2 callouts."
     return _re_callout.sub(_co, s)
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #5b19ae68-9d40-498f-bcda-38496b139a27
 _re_video = re.compile(r'^>\syoutube:(.*)', flags=re.MULTILINE)
 def _v(x): return "{{< " + f"video {x[1].strip()}" + " >}}"
 def _convert_video(s):
     "Replace nbdev v1 with v2 video embeds."
     return _re_video.sub(_v, s)
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #614a8cb8-5c43-45de-b93f-8646e549cc0e
 _shortcuts = compose(_convert_video, _convert_callout)
 
 def _repl_v1shortcuts(cell):
@@ -150,7 +150,7 @@ def _repl_v1shortcuts(cell):
     if cell.get('source') and cell.get('cell_type') == 'markdown':
         cell['source'] = _shortcuts(cell['source'])
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #9383e062-487b-4259-ab96-f427994742cc
 def migrate_nb(path, overwrite=True):
     "Migrate Notebooks from nbdev v1 and fastpages."
     nbp = NBProcessor(path, procs=[FrontmatterProc, MigrateProc, _repl_v1shortcuts, _repl_v1dir], rm_directives=False)
@@ -158,14 +158,14 @@ def migrate_nb(path, overwrite=True):
     if overwrite: write_nb(nbp.nb, path)
     return nbp.nb
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #e10f1558-95cb-49a6-b1e6-affd6fa3ecd2
 def migrate_md(path, overwrite=True):
     "Migrate Markdown Files from fastpages."
     txt = fp_md_fm(path)
     if overwrite: path.write_text(txt)
     return txt
 
-# %% ../nbs/api/16_migrate.ipynb
+# %% ../nbs/api/16_migrate.ipynb #3eb0cd02-e1ee-4910-be82-570434b974b5
 @call_parse
 def nbdev_migrate(
     path:str=None, # A path or glob containing notebooks and markdown files to migrate