nbdev 3.0.7__tar.gz → 3.0.9__tar.gz

{nbdev-3.0.7/nbdev.egg-info → nbdev-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.0.7
+Version: 3.0.9
 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.7 → nbdev-3.0.9}/nbdev/__init__.py

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

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/_modidx.py

@@ -49,6 +49,7 @@ d = { 'settings': { 'branch': 'main',
                               'nbdev.config.bump_version': ('api/config.html#bump_version', 'nbdev/config.py'),
                               'nbdev.config.create_output': ('api/config.html#create_output', 'nbdev/config.py'),
                               'nbdev.config.get_config': ('api/config.html#get_config', 'nbdev/config.py'),
+                              'nbdev.config.import_obj': ('api/config.html#import_obj', 'nbdev/config.py'),
                               'nbdev.config.is_nbdev': ('api/config.html#is_nbdev', 'nbdev/config.py'),
                               'nbdev.config.nbdev_create_config': ('api/config.html#nbdev_create_config', 'nbdev/config.py'),
                               'nbdev.config.read_version': ('api/config.html#read_version', 'nbdev/config.py'),
@@ -98,10 +99,7 @@ d = { 'settings': { 'branch': 'main',
                               'nbdev.export.ExportModuleProc._export_': ('api/export.html#exportmoduleproc._export_', 'nbdev/export.py'),
                               'nbdev.export.ExportModuleProc._exporti_': ('api/export.html#exportmoduleproc._exporti_', 'nbdev/export.py'),
                               'nbdev.export.ExportModuleProc.begin': ('api/export.html#exportmoduleproc.begin', 'nbdev/export.py'),
-                              'nbdev.export.black_format': ('api/export.html#black_format', 'nbdev/export.py'),
-                              'nbdev.export.nb_export': ('api/export.html#nb_export', 'nbdev/export.py'),
-                              'nbdev.export.optional_procs': ('api/export.html#optional_procs', 'nbdev/export.py'),
-                              'nbdev.export.scrub_magics': ('api/export.html#scrub_magics', 'nbdev/export.py')},
+                              'nbdev.export.nb_export': ('api/export.html#nb_export', 'nbdev/export.py')},
             'nbdev.extract_attachments': {},
             'nbdev.frontmatter': { 'nbdev.frontmatter.FrontmatterProc': ('api/frontmatter.html#frontmatterproc', 'nbdev/frontmatter.py'),
                                    'nbdev.frontmatter.FrontmatterProc._update': ( 'api/frontmatter.html#frontmatterproc._update',
@@ -222,7 +220,6 @@ d = { 'settings': { 'branch': 'main',
                                   'nbdev.processors._default_exp': ('api/processors.html#_default_exp', 'nbdev/processors.py'),
                                   'nbdev.processors._do_eval': ('api/processors.html#_do_eval', 'nbdev/processors.py'),
                                   'nbdev.processors._get_nm': ('api/processors.html#_get_nm', 'nbdev/processors.py'),
-                                  'nbdev.processors._import_obj': ('api/processors.html#_import_obj', 'nbdev/processors.py'),
                                   'nbdev.processors._is_showdoc': ('api/processors.html#_is_showdoc', 'nbdev/processors.py'),
                                   'nbdev.processors._re_hideline': ('api/processors.html#_re_hideline', 'nbdev/processors.py'),
                                   'nbdev.processors._show_docs': ('api/processors.html#_show_docs', 'nbdev/processors.py'),
@@ -333,6 +330,7 @@ d = { 'settings': { 'branch': 'main',
                                'nbdev.release.release_pypi': ('api/release.html#release_pypi', 'nbdev/release.py'),
                                'nbdev.release.write_conda_meta': ('api/release.html#write_conda_meta', 'nbdev/release.py'),
                                'nbdev.release.write_requirements': ('api/release.html#write_requirements', 'nbdev/release.py')},
+            'nbdev.scrubmagics': {},
             'nbdev.serve': { 'nbdev.serve._is_qpy': ('api/serve.html#_is_qpy', 'nbdev/serve.py'),
                              'nbdev.serve._proc_file': ('api/serve.html#_proc_file', 'nbdev/serve.py'),
                              'nbdev.serve.proc_nbs': ('api/serve.html#proc_nbs', 'nbdev/serve.py')},

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/cli.py

@@ -184,16 +184,16 @@ def watch_export(nbs:str=None, # Nb directory to watch for changes
     lib = lib or (cfg.lib_path if cfg else '.')
     if cfg and (nbs != cfg.nbs_path or lib != cfg.lib_path) and not force:
         raise ValueError("In nbdev project. Use --force to override config.")
-    run(f'nbdev_export')
+    run('nbdev-export')
     def _export(e,lib=lib):
         p = e.src_path
         if (not '.ipynb_checkpoints' in p and p.endswith('.ipynb') and not Path(p).name.startswith(('tmp','.~'))):
             if e.event_type == 'modified':
                 time.sleep(0.1)
-                try: run(f'nb_export --lib_path {lib} "{p}"')
+                try: run(f'nb-export --lib_path {lib} "{p}"')
                 except IOError:
                     time.sleep(0.3)
-                    run(f'nb_export --lib_path {lib} "{p}"')
+                    run(f'nb-export --lib_path {lib} "{p}"')
     with fs_watchdog(_export, nbs):
         while True: time.sleep(1)
 

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/config.py

@@ -5,7 +5,7 @@
 # %% auto #0
 __all__ = ['pyproject_nm', 'pyproject_tmpl', 'nbdev_defaults', 'pyproj_tmpl', 'nbdev_create_config', 'ConfigToml', 'get_config',
            'is_nbdev', 'create_output', 'show_src', 'read_version', 'set_version', 'bump_version', 'update_version',
-           'update_proj', 'add_init', 'write_cells']
+           'update_proj', 'add_init', 'import_obj', 'write_cells']
 
 # %% ../nbs/api/01_config.ipynb #6fd14ecd
 from datetime import datetime
@@ -16,7 +16,7 @@ from fastcore.script import *
 from fastcore.style import *
 from fastcore.xdg import *
 
-import ast,warnings
+import ast,importlib,warnings
 from IPython.display import Markdown
 from execnb.nbio import read_nb,NbCell
 from urllib.error import HTTPError
@@ -152,7 +152,7 @@ def _load_toml(p):
 
 def _has_nbdev(p):
     "True if pyproject.toml at `p` has [tool.nbdev]"
-    try: return bool(_load_toml(p).get('tool', {}).get('nbdev', {}))
+    try: return _load_toml(p).get('tool', {}).get('nbdev') is not None
     except Exception: return False
 
 def _find_nbdev_pyproject(path=None):
@@ -167,7 +167,8 @@ def _find_nbdev_pyproject(path=None):
 
 # %% ../nbs/api/01_config.ipynb #3dac70e0
 nbdev_defaults = dict(nbs_path='nbs', doc_path='_docs', tst_flags='notest', recursive=True, readme_nb='index.ipynb',
-    clean_ids=True, clear_all=False, put_version_in_init=True, jupyter_hooks=False, black_formatting=False, branch='main')
+    clean_ids=True, clear_all=False, put_version_in_init=True, jupyter_hooks=False, branch='main',
+    doc_procs=[], export_procs=[])
 
 _path_keys = 'lib_path', 'nbs_path', 'doc_path'
 
@@ -337,6 +338,13 @@ def add_init(path=None):
     if get_config().get('put_version_in_init', True): update_version(path)
     if get_config().get('update_pyproject', True): update_proj(path.parent)
 
+# %% ../nbs/api/01_config.ipynb #95cebda6
+def import_obj(s):
+    "Import and return `module:obj` string"
+    mod_nm, obj_nm = s.split(':')
+    mod = importlib.import_module(mod_nm)
+    return getattr(mod, obj_nm)
+
 # %% ../nbs/api/01_config.ipynb #cdd05b4c
 def write_cells(cells, hdr, file, solo_nb=False):
     "Write `cells` to `file` along with header `hdr` (mainly for nbdev internal use)."

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/doclinks.py

@@ -143,17 +143,17 @@ def nbglob_cli(
 @delegates(nbglob_cli)
 def nbdev_export(
     path:str=None, # Path or filename
-    procs:Param("tokens naming the export processors to use.", nargs="*", choices=optional_procs())="black_format",
+    procs:str='', # Space-separated `module:name` processors to use (or set `export_procs` in pyproject.toml)
     **kwargs):
     "Export notebooks in `path` to Python modules"
     if os.environ.get('IN_TEST',0): return
     if not is_nbdev(): raise Exception('`nbdev_export` must be called from a directory within a nbdev project.')
-    if procs:
-        import nbdev.export
-        procs = [getattr(nbdev.export, p) for p in L(procs)]
+    cfg = get_config()
+    procs = procs.split() if procs else cfg.get('export_procs', [])
+    procs = [import_obj(p) for p in procs] if procs else None
     files = nbglob(path=path, as_path=True, **kwargs).sorted('name')
     for f in files: nb_export(f, procs=procs)
-    add_init(get_config().lib_path)
+    add_init(cfg.lib_path)
     _build_modidx()
 
 # %% ../nbs/api/05_doclinks.ipynb #3134c22b

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/export.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/04_export.ipynb.
 
 # %% auto #0
-__all__ = ['ExportModuleProc', 'black_format', 'scrub_magics', 'optional_procs', 'nb_export']
+__all__ = ['ExportModuleProc', 'nb_export']
 
 # %% ../nbs/api/04_export.ipynb #3b932371
 from .config import *
@@ -33,37 +33,6 @@ class ExportModuleProc:
         if cell.cell_type=='markdown' and src.startswith('# '): self.modules['#'].append(cell)
     _exports_=_export_
 
-# %% ../nbs/api/04_export.ipynb #6f524839
-def black_format(cell, # Cell to format
-                 force=False): # Turn black formatting on regardless of pyproject.toml
-    "Processor to format code with `black`"
-    cfg = get_config()
-    if (not cfg.black_formatting and not force) or cell.cell_type != 'code': return
-    try: import black
-    except: raise ImportError("You must install black: `pip install black` if you wish to use black formatting with nbdev")
-    else:
-        _format_str = partial(black.format_str, mode = black.Mode())
-        try: cell.source = _format_str(cell.source).strip()
-        except: pass
-
-# %% ../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)
-
-def scrub_magics(cell): # Cell to format
-    "Processor to remove cell magics from exported code"
-    cfg = get_config()
-    if cell.cell_type != 'code': return
-    try: cell.source = _magics_pattern.sub('', cell.source)
-    except: pass
-
-# %% ../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 #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.

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/processors.py

@@ -9,7 +9,6 @@ __all__ = ['populate_language', 'insert_warning', 'cell_lang', 'add_show_docs',
 
 # %% ../nbs/api/10_processors.ipynb #2398f5ef-06d3-4890-8a54-7cf4f81f3894
 import ast
-import importlib
 
 from .config import *
 from .imports import *
@@ -261,18 +260,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 #a761e07c
-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 #4b450cff
 class FilterDefaults:
     "Override `FilterDefaults` to change which notebook processors are used"
     def xtra_procs(self):
-        imps = get_config().get('procs', '').split()
-        return [_import_obj(o) for o in imps]
+        imps = get_config().get('doc_procs', [])
+        if isinstance(imps, str): imps = imps.split()
+        return [import_obj(o) for o in imps]
 
     def base_procs(self):
         return [FrontmatterProc, populate_language, add_show_docs, insert_warning,

nbdev-3.0.9/nbdev/scrubmagics.py

@@ -0,0 +1,13 @@
+"""Scrub Jupyter magics from exported code"""
+
+__all__ = ['scrub_magics']
+
+import re
+
+_magics_pattern = re.compile(r'^\s*(%%|%).*\n?', re.MULTILINE)
+
+def scrub_magics(cell):
+    "Remove Jupyter magic lines (e.g. %%time, %matplotlib) from exported code cells"
+    if cell.cell_type != 'code': return
+    try: cell.source = _magics_pattern.sub('', cell.source)
+    except: pass

{nbdev-3.0.7 → nbdev-3.0.9}/nbdev/test.py

@@ -28,7 +28,8 @@ def test_nb(fn,  # file name of notebook to test
             force_flags=None,  # list of flags marking cells to always run
             do_print=False,  # print completion?
             showerr=True,  # print errors to stderr?
-            basepath=None):  # path to add to sys.path
+            basepath=None,  # path to add to sys.path
+            verbose=False):  # stream stdout/stderr from cells to console?
     "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'
@@ -49,7 +50,7 @@ def test_nb(fn,  # file name of notebook to test
     if do_print: print(f'Starting {fn}')
     try:
         with working_directory(fn.parent):
-            k.run_all(nb, exc_stop=True, preproc=_no_eval)
+            k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose)
             res = True
     except: 
         if showerr: sys.stderr.write(k.prettytb(fname=fn)+'\n')
@@ -76,6 +77,7 @@ def nbdev_test(
     do_print:bool=False, # Print start and end of each notebook
     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?
     **kwargs):
     "Test in parallel notebooks matching `path`, passing along `flags`"
     skip_flags = get_config().tst_flags
@@ -90,7 +92,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, **kw)
+                           basepath=get_config().config_path, pause=pause, do_print=do_print, verbose=verbose, **kw)
     passed,times = zip(*results)
     if all(passed): print("Success.")
     else: 

{nbdev-3.0.7 → nbdev-3.0.9/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.0.7
+Version: 3.0.9
 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.7 → nbdev-3.0.9}/nbdev.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ nbdev/processors.py
 nbdev/qmd.py
 nbdev/quarto.py
 nbdev/release.py
+nbdev/scrubmagics.py
 nbdev/serve.py
 nbdev/serve_drv.py
 nbdev/showdoc.py