nbdev 2.3.16__tar.gz → 2.3.18__tar.gz

{nbdev-2.3.16/nbdev.egg-info → nbdev-2.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbdev
-Version: 2.3.16
+Version: 2.3.18
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/fastai/nbdev
 Author: Jeremy Howard and Hamel Husain

{nbdev-2.3.16 → nbdev-2.3.18}/nbdev/__init__.py

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

{nbdev-2.3.16 → nbdev-2.3.18}/nbdev/_modidx.py

@@ -203,6 +203,7 @@ d = { 'settings': { 'branch': 'master',
                                   'nbdev.processors.add_show_docs': ('api/processors.html#add_show_docs', 'nbdev/processors.py'),
                                   'nbdev.processors.add_show_docs.begin': ( 'api/processors.html#add_show_docs.begin',
                                                                             'nbdev/processors.py'),
+                                  'nbdev.processors.boxify': ('api/processors.html#boxify', 'nbdev/processors.py'),
                                   'nbdev.processors.cell_lang': ('api/processors.html#cell_lang', 'nbdev/processors.py'),
                                   'nbdev.processors.clean_magics': ('api/processors.html#clean_magics', 'nbdev/processors.py'),
                                   'nbdev.processors.clean_show_doc': ('api/processors.html#clean_show_doc', 'nbdev/processors.py'),
@@ -212,12 +213,15 @@ d = { 'settings': { 'branch': 'master',
                                   'nbdev.processors.exec_show_docs.begin': ( 'api/processors.html#exec_show_docs.begin',
                                                                              'nbdev/processors.py'),
                                   'nbdev.processors.exec_show_docs.end': ('api/processors.html#exec_show_docs.end', 'nbdev/processors.py'),
+                                  'nbdev.processors.fdiv': ('api/processors.html#fdiv', 'nbdev/processors.py'),
                                   'nbdev.processors.filter_stream_': ('api/processors.html#filter_stream_', 'nbdev/processors.py'),
                                   'nbdev.processors.hide_': ('api/processors.html#hide_', 'nbdev/processors.py'),
                                   'nbdev.processors.hide_line': ('api/processors.html#hide_line', 'nbdev/processors.py'),
                                   'nbdev.processors.insert_warning': ('api/processors.html#insert_warning', 'nbdev/processors.py'),
                                   'nbdev.processors.insert_warning.begin': ( 'api/processors.html#insert_warning.begin',
                                                                              'nbdev/processors.py'),
+                                  'nbdev.processors.mv_exports': ('api/processors.html#mv_exports', 'nbdev/processors.py'),
+                                  'nbdev.processors.mv_exports.begin': ('api/processors.html#mv_exports.begin', 'nbdev/processors.py'),
                                   'nbdev.processors.populate_language': ('api/processors.html#populate_language', 'nbdev/processors.py'),
                                   'nbdev.processors.populate_language.begin': ( 'api/processors.html#populate_language.begin',
                                                                                 'nbdev/processors.py'),

{nbdev-2.3.16 → nbdev-2.3.18}/nbdev/processors.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/10_processors.ipynb.
 
 # %% auto 0
-__all__ = ['populate_language', 'insert_warning', 'cell_lang', 'add_show_docs', 'add_links', 'add_fold', 'strip_ansi',
-           'strip_hidden_metadata', 'hide_', 'hide_line', 'filter_stream_', 'clean_magics', 'rm_header_dash',
-           'rm_export', 'clean_show_doc', 'exec_show_docs', 'FilterDefaults']
+__all__ = ['populate_language', 'insert_warning', 'cell_lang', 'add_show_docs', 'fdiv', 'boxify', 'mv_exports', 'add_links',
+           'add_fold', 'strip_ansi', 'strip_hidden_metadata', 'hide_', 'hide_line', 'filter_stream_', 'clean_magics',
+           'rm_header_dash', 'rm_export', 'clean_show_doc', 'exec_show_docs', 'FilterDefaults']
 
 # %% ../nbs/api/10_processors.ipynb 2
 import ast
@@ -47,7 +47,7 @@ _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]!='_'] if cellp else []
+            if isinstance(o,_def_types) and o.name not in shown and (o.name[0]!='_' or o.name[:2]=='__')] if cellp else []
 
 def _get_nm(tree):
     i = tree.value.args[0]
@@ -76,10 +76,39 @@ class add_show_docs(Processor):
         for cell in reversed(exports):
             if cell_lang(cell) != 'python':  raise ValueError(f"{cell.metadata.language} can't export:\n{cell.source}")
             nms = _def_names(cell, shown_docs)
-            for nm in nms: nb.cells.insert(cell.idx_+1, mk_cell(f'show_doc({nm})'))
+            for nm in nms:
+                new_cell = mk_cell(f'show_doc({nm})')
+                new_cell.has_sd = True
+                nb.cells.insert(cell.idx_+1, new_cell)
         nb.has_docs_ = shown_docs or exports
 
 # %% ../nbs/api/10_processors.ipynb 17
+def fdiv(attrs=''):
+    "Create a fenced div markdown cell in quarto"
+    if attrs: attrs = ' {'+attrs+'}'
+    return mk_cell(':::'+attrs, cell_type='markdown')
+
+# %% ../nbs/api/10_processors.ipynb 19
+def boxify(cells):
+    "Add a box around `cells`"
+    if not isinstance(cells, list): cells = [cells]
+    res = [fdiv('.py-2 .px-3 .mb-4 fig-align="center" .border .rounded .shadow-sm')]
+    return res+cells+[fdiv()]
+
+# %% ../nbs/api/10_processors.ipynb 20
+class mv_exports(Processor):
+    "Move `exports` cells to after the `show_doc`"
+    def begin(self):
+        cells = self.nb.cells
+        exports = L(c for c in cells if c.cell_type=='code' and 'exports' in c.directives_)
+        for cell in reversed(exports):
+            idx = cell.idx_
+            if getattr(cells[idx+1], 'has_sd', 0):
+                doccell = cells.pop(idx+1)
+                srccell = cells.pop(idx)
+                cells[idx:idx] = boxify([doccell,srccell])
+
+# %% ../nbs/api/10_processors.ipynb 21
 _re_defaultexp = re.compile(r'^\s*#\|\s*default_exp\s+(\S+)', flags=re.MULTILINE)
 
 def _default_exp(nb):
@@ -88,7 +117,7 @@ def _default_exp(nb):
     default_exp = first(code_src.filter().map(_re_defaultexp.search).filter())
     return default_exp.group(1) if default_exp else None
 
-# %% ../nbs/api/10_processors.ipynb 19
+# %% ../nbs/api/10_processors.ipynb 23
 def add_links(cell):
     "Add links to markdown cells"
     nl = NbdevLookup()
@@ -97,13 +126,13 @@ def add_links(cell):
         if hasattr(o, 'data') and hasattr(o['data'], 'text/markdown'):
             o.data['text/markdown'] = [nl.link_line(s) for s in o.data['text/markdown']]
 
-# %% ../nbs/api/10_processors.ipynb 21
+# %% ../nbs/api/10_processors.ipynb 25
 def add_fold(cell):
     "Add `code-fold` to `exports` cells"
     if cell.cell_type != 'code' or 'exports' not in cell.directives_: return
     cell.source = f'#| code-fold: show\n#| code-summary: "Exported source"\n{cell.source}'
 
-# %% ../nbs/api/10_processors.ipynb 24
+# %% ../nbs/api/10_processors.ipynb 28
 _re_ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
 
 def strip_ansi(cell):
@@ -111,17 +140,17 @@ def strip_ansi(cell):
     for outp in cell.get('outputs', []):
         if outp.get('name')=='stdout': outp['text'] = [_re_ansi_escape.sub('', o) for o in outp.text]
 
-# %% ../nbs/api/10_processors.ipynb 26
+# %% ../nbs/api/10_processors.ipynb 30
 def strip_hidden_metadata(cell):
     '''Strips "hidden" metadata property from code cells so it doesn't interfere with docs rendering'''
     if cell.cell_type == 'code' and 'metadata' in cell: cell.metadata.pop('hidden',None)
 
-# %% ../nbs/api/10_processors.ipynb 27
+# %% ../nbs/api/10_processors.ipynb 31
 def hide_(cell):
     "Hide cell from output"
     del(cell['source'])
 
-# %% ../nbs/api/10_processors.ipynb 29
+# %% ../nbs/api/10_processors.ipynb 33
 def _re_hideline(lang=None): return re.compile(fr'{langs[lang]}\|\s*hide_line\s*$', re.MULTILINE)
 
 def hide_line(cell):
@@ -130,7 +159,7 @@ def hide_line(cell):
     if cell.cell_type == 'code' and _re_hideline(lang).search(cell.source):
         cell.source = '\n'.join([c for c in cell.source.splitlines() if not _re_hideline(lang).search(c)])
 
-# %% ../nbs/api/10_processors.ipynb 32
+# %% ../nbs/api/10_processors.ipynb 36
 def filter_stream_(cell, *words):
     "Remove output lines containing any of `words` in `cell` stream output"
     if not words: return
@@ -138,14 +167,14 @@ def filter_stream_(cell, *words):
         if outp.output_type == 'stream':
             outp['text'] = [l for l in outp.text if not re.search('|'.join(words), l)]
 
-# %% ../nbs/api/10_processors.ipynb 34
+# %% ../nbs/api/10_processors.ipynb 38
 _magics_pattern = re.compile(r'^\s*(%%|%).*', re.MULTILINE)
 
 def clean_magics(cell):
     "A preprocessor to remove cell magic commands"
     if cell.cell_type == 'code': cell.source = _magics_pattern.sub('', cell.source).strip()
 
-# %% ../nbs/api/10_processors.ipynb 36
+# %% ../nbs/api/10_processors.ipynb 40
 _re_hdr_dash = re.compile(r'^#+\s+.*\s+-\s*$', re.MULTILINE)
 
 def rm_header_dash(cell):
@@ -154,14 +183,14 @@ def rm_header_dash(cell):
         src = cell.source.strip()
         if cell.cell_type == 'markdown' and src.startswith('#') and src.endswith(' -'): del(cell['source'])
 
-# %% ../nbs/api/10_processors.ipynb 38
+# %% ../nbs/api/10_processors.ipynb 42
 _hide_dirs = {'export','exporti', 'hide','default_exp'}
 
 def rm_export(cell):
     "Remove cells that are exported or hidden"
     if cell.directives_ and (cell.directives_.keys() & _hide_dirs): del(cell['source'])
 
-# %% ../nbs/api/10_processors.ipynb 40
+# %% ../nbs/api/10_processors.ipynb 44
 _re_showdoc = re.compile(r'^show_doc', re.MULTILINE)
 def _is_showdoc(cell): return cell['cell_type'] == 'code' and _re_showdoc.search(cell.source)
 def _add_directives(cell, d):
@@ -173,7 +202,7 @@ def clean_show_doc(cell):
     if not _is_showdoc(cell): return
     _add_directives(cell, {'output':'asis','echo':'false'})
 
-# %% ../nbs/api/10_processors.ipynb 41
+# %% ../nbs/api/10_processors.ipynb 45
 def _ast_contains(trees, types):
     for tree in trees:
         for node in ast.walk(tree):
@@ -194,7 +223,7 @@ def _do_eval(cell):
         return True
     if _show_docs(trees): return True
 
-# %% ../nbs/api/10_processors.ipynb 42
+# %% ../nbs/api/10_processors.ipynb 46
 class exec_show_docs(Processor):
     "Execute cells needed for `show_docs` output, including exported cells and imports"
     def begin(self):
@@ -221,13 +250,13 @@ class exec_show_docs(Processor):
             widgets = {**old, **new, 'state': {**old.get('state', {}), **new['state']}}
             self.nb.metadata['widgets'] = {mimetype: widgets}
 
-# %% ../nbs/api/10_processors.ipynb 44
+# %% ../nbs/api/10_processors.ipynb 48
 def _import_obj(s):
     mod_nm, obj_nm = s.split(':')
     mod = importlib.import_module(mod_nm)
     return getattr(mod, obj_nm)
 
-# %% ../nbs/api/10_processors.ipynb 45
+# %% ../nbs/api/10_processors.ipynb 49
 class FilterDefaults:
     "Override `FilterDefaults` to change which notebook processors are used"
     def xtra_procs(self):
@@ -237,7 +266,7 @@ class FilterDefaults:
     def base_procs(self):
         return [FrontmatterProc, populate_language, add_show_docs, insert_warning,
                 strip_ansi, hide_line, filter_stream_, rm_header_dash,
-                clean_show_doc, exec_show_docs, rm_export, clean_magics, hide_, add_links, add_fold, strip_hidden_metadata]
+                clean_show_doc, exec_show_docs, rm_export, clean_magics, hide_, add_links, add_fold, mv_exports, strip_hidden_metadata]
 
     def procs(self):
         "Processors for export"

{nbdev-2.3.16 → nbdev-2.3.18/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbdev
-Version: 2.3.16
+Version: 2.3.18
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/fastai/nbdev
 Author: Jeremy Howard and Hamel Husain

{nbdev-2.3.16 → nbdev-2.3.18}/settings.ini

@@ -9,7 +9,7 @@ author = Jeremy Howard and Hamel Husain
 author_email = j@fast.ai
 branch = master
 min_python = 3.7
-version = 2.3.16
+version = 2.3.18
 audience = Developers
 language = English
 custom_sidebar = True