correct idxs

Author: hamelsmu

nbdev/_modidx.py

@@ -297,6 +297,8 @@
                                'nbdev.showdoc.show_doc': ('09_API/showdoc.html#show_doc', 'nbdev/showdoc.py'),
                                'nbdev.showdoc.showdoc_nm': ('09_API/showdoc.html#showdoc_nm', 'nbdev/showdoc.py')},
             'nbdev.sync': { 'nbdev.sync._get_call': ('09_API/sync.html#_get_call', 'nbdev/sync.py'),
+                            'nbdev.sync._mod_files': ('09_API/sync.html#_mod_files', 'nbdev/sync.py'),
+                            'nbdev.sync._script2notebook': ('09_API/sync.html#_script2notebook', 'nbdev/sync.py'),
                             'nbdev.sync._to_absolute': ('09_API/sync.html#_to_absolute', 'nbdev/sync.py'),
                             'nbdev.sync._update_lib': ('09_API/sync.html#_update_lib', 'nbdev/sync.py'),
                             'nbdev.sync.absolute_import': ('09_API/sync.html#absolute_import', 'nbdev/sync.py'),

nbdev/cli.py

@@ -27,7 +27,7 @@
 # %% auto 0
 __all__ = ['FilterDefaults', 'nbdev_filter', 'extract_tgz', 'nbdev_new', 'chelp']
 
-# %% ../nbs/09_API/12_cli.ipynb 6
+# %% ../nbs/09_API/12_cli.ipynb 5
 class FilterDefaults:
     "Override `FilterDefaults` to change which notebook processors are used"
     def xtra_procs(self): return []
@@ -45,7 +45,7 @@ def nb_proc(self, nb):
         "Get an `NBProcessor` with these processors"
         return NBProcessor(nb=nb, procs=self.procs())
 
-# %% ../nbs/09_API/12_cli.ipynb 7
+# %% ../nbs/09_API/12_cli.ipynb 6
 @call_parse
 def nbdev_filter(
     nb_txt:str=None,  # Notebook text (uses stdin if not provided)
@@ -68,20 +68,20 @@ def nbdev_filter(
     if printit: print(res, flush=True)
     else: return res
 
-# %% ../nbs/09_API/12_cli.ipynb 10
+# %% ../nbs/09_API/12_cli.ipynb 9
 def extract_tgz(url, dest='.'):
     from fastcore.net import urlopen
     with urlopen(url) as u: tarfile.open(mode='r:gz', fileobj=u).extractall(dest)
 
-# %% ../nbs/09_API/12_cli.ipynb 11
+# %% ../nbs/09_API/12_cli.ipynb 10
 def _render_nb(fn, cfg):
     "Render templated values like `{{lib_name}}` in notebook at `fn` from `cfg`"
     txt = fn.read_text()
     txt = txt.replace('from your_lib.core', f'from {cfg.lib_path}.core') # for compatibility with old templates
     for k,v in cfg.d.items(): txt = txt.replace('{{'+k+'}}', v)
     fn.write_text(txt)
 
-# %% ../nbs/09_API/12_cli.ipynb 12
+# %% ../nbs/09_API/12_cli.ipynb 11
 @call_parse
 @delegates(nbdev_create_config)
 def nbdev_new(**kwargs):
@@ -108,7 +108,7 @@ def nbdev_new(**kwargs):
     nbdev_export.__wrapped__()
     nbdev_readme.__wrapped__()
 
-# %% ../nbs/09_API/12_cli.ipynb 15
+# %% ../nbs/09_API/12_cli.ipynb 14
 @call_parse
 def chelp():
     "Show help for all console scripts"

nbdev/maker.py

@@ -7,7 +7,7 @@
 __all__ = ['find_var', 'read_var', 'update_var', 'ModuleMaker', 'decor_id', 'retr_exports', 'make_code_cells', 'relative_import',
            'update_import']
 
-# %% ../nbs/09_API/02_maker.ipynb 4
+# %% ../nbs/09_API/02_maker.ipynb 3
 from .config import *
 from .imports import *
 
@@ -22,7 +22,7 @@
 from pprint import pformat
 from textwrap import TextWrapper
 
-# %% ../nbs/09_API/02_maker.ipynb 9
+# %% ../nbs/09_API/02_maker.ipynb 8
 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))
@@ -32,7 +32,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/09_API/02_maker.ipynb 11
+# %% ../nbs/09_API/02_maker.ipynb 10
 def read_var(code, varname):
     "Eval and return the value of `varname` defined in `code`"
     lines = code.splitlines()
@@ -43,7 +43,7 @@ def read_var(code, varname):
     try: return eval('\n'.join(res))
     except SyntaxError: raise Exception('\n'.join(res)) from None
 
-# %% ../nbs/09_API/02_maker.ipynb 13
+# %% ../nbs/09_API/02_maker.ipynb 12
 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:
@@ -59,7 +59,7 @@ def update_var(varname, func, fn=None, code=None):
     if fn: fn.write_text(code)
     else: return code
 
-# %% ../nbs/09_API/02_maker.ipynb 16
+# %% ../nbs/09_API/02_maker.ipynb 15
 class ModuleMaker:
     "Helper class to create exported library from notebook source cells"
     def __init__(self, dest, name, nb_path, is_new=True, parse=True):
@@ -71,12 +71,12 @@ def __init__(self, dest, name, nb_path, is_new=True, parse=True):
         self.dest2nb = nb_path.relpath(self.fname.parent)
         self.hdr = f"# %% {self.dest2nb}"
 
-# %% ../nbs/09_API/02_maker.ipynb 19
+# %% ../nbs/09_API/02_maker.ipynb 18
 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/09_API/02_maker.ipynb 20
+# %% ../nbs/09_API/02_maker.ipynb 19
 _def_types = ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef
 _assign_types = ast.AnnAssign, ast.Assign, ast.AugAssign
 
@@ -87,7 +87,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/09_API/02_maker.ipynb 21
+# %% ../nbs/09_API/02_maker.ipynb 20
 def retr_exports(trees):
     # include anything mentioned in "_all_", even if otherwise private
     # NB: "_all_" can include strings (names), or symbols, so we look for "id" or "value"
@@ -100,17 +100,17 @@ def retr_exports(trees):
     exports = (assign_targs.attrgot('id')+syms).filter(lambda o: o and o[0]!='_')
     return (exports+all_vals).unique()
 
-# %% ../nbs/09_API/02_maker.ipynb 22
+# %% ../nbs/09_API/02_maker.ipynb 21
 @patch
 def make_all(self:ModuleMaker, cells):
     "Create `__all__` with all exports in `cells`"
     if cells is None: return ''
     return retr_exports(L(cells).map(NbCell.parsed_).concat())
 
-# %% ../nbs/09_API/02_maker.ipynb 23
+# %% ../nbs/09_API/02_maker.ipynb 22
 def make_code_cells(*ss): return dict2nb({'cells':L(ss).map(mk_cell)}).cells
 
-# %% ../nbs/09_API/02_maker.ipynb 26
+# %% ../nbs/09_API/02_maker.ipynb 25
 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/09_API/02_maker.ipynb 28
+# %% ../nbs/09_API/02_maker.ipynb 27
 # 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/09_API/02_maker.ipynb 29
+# %% ../nbs/09_API/02_maker.ipynb 28
 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/09_API/02_maker.ipynb 31
+# %% ../nbs/09_API/02_maker.ipynb 30
 @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/09_API/02_maker.ipynb 32
+# %% ../nbs/09_API/02_maker.ipynb 31
 def _import2relative(cells, lib_name=None):
     "Converts `cells` to use `import2relative` based on `lib_name`"
     if lib_name is None: lib_name = get_config().lib_name
     for cell in cells: cell.import2relative(lib_name)
 
-# %% ../nbs/09_API/02_maker.ipynb 33
+# %% ../nbs/09_API/02_maker.ipynb 32
 @patch
 def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
     "Write module containing `cells` with `__all__` generated from `all_cells`"
@@ -198,10 +198,10 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
         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: f.write(f"\n\n# %% auto 0\n__all__ = {all_str}")
-        write_cells(cells[last_future:], self.hdr, f, 1 if last_future>0 else 0)
+        write_cells(cells[last_future:], self.hdr, f)
         f.write('\n')
 
-# %% ../nbs/09_API/02_maker.ipynb 38
+# %% ../nbs/09_API/02_maker.ipynb 37
 @patch
 def _update_all(self:ModuleMaker, all_cells, alls):
     return pformat(alls + self.make_all(all_cells), width=160)
@@ -212,7 +212,7 @@ def _make_exists(self:ModuleMaker, cells, all_cells=None):
     if all_cells and self.parse: update_var('__all__', partial(self._update_all, all_cells), fn=self.fname)
     with self.fname.open('a') as f: write_cells(cells, self.hdr, f)
 
-# %% ../nbs/09_API/02_maker.ipynb 44
+# %% ../nbs/09_API/02_maker.ipynb 43
 def _basic_export_nb2(fname, name, dest=None):
     "A basic exporter to bootstrap nbdev using `ModuleMaker`"
     if dest is None: dest = get_config().path('lib_path')

nbdev/qmd.py

@@ -10,15 +10,15 @@
 # %% auto 0
 __all__ = ['setup', 'meta', 'div', 'img', 'btn']
 
-# %% ../nbs/09_API/14_qmd.ipynb 5
+# %% ../nbs/09_API/14_qmd.ipynb 4
 def setup():
     mod = inspect.getmodule(inspect.currentframe().f_back)
     path = Path(mod.__file__)
     os.chdir(path.parent)
     sys.stdout = open(path.with_suffix('.qmd'), 'w')
     print(mod.__doc__)
 
-# %% ../nbs/09_API/14_qmd.ipynb 6
+# %% ../nbs/09_API/14_qmd.ipynb 5
 def meta(md,  # Markdown to add meta to
          classes=None,  # List of CSS classes to add
          style=None,  # Dict of CSS styles to add
@@ -33,15 +33,15 @@ def meta(md,  # Markdown to add meta to
     meta = ' '.join(meta)
     return md + ("{" + meta + "}" if meta else "")
 
-# %% ../nbs/09_API/14_qmd.ipynb 7
+# %% ../nbs/09_API/14_qmd.ipynb 6
 def div(txt,  # Markdown to add meta to
         classes=None,  # List of CSS classes to add
         style=None,  # Dict of CSS styles to add
         **kwargs):
     "A qmd div with optional metadata section"
     return meta("::: ", classes=classes, style=style, **kwargs) + f"\n\n{txt}\n\n:::\n\n"
 
-# %% ../nbs/09_API/14_qmd.ipynb 8
+# %% ../nbs/09_API/14_qmd.ipynb 7
 def img(fname,  # Image to link to
         classes=None,  # List of CSS classes to add
         style=None,   # Dict of CSS styles to add
@@ -59,7 +59,7 @@ def img(fname,  # Image to link to
     res = meta(f'![]({fname})', classes=classes, style=style, **kwargs)
     return  f'[{res}]({fname})' if link else res
 
-# %% ../nbs/09_API/14_qmd.ipynb 9
+# %% ../nbs/09_API/14_qmd.ipynb 8
 def btn(txt, # Button text
         link,  # Button link URL
         classes=None,  # List of CSS classes to add