nbdev 3.3.17__tar.gz → 3.3.18__tar.gz

{nbdev-3.3.17/nbdev.egg-info → nbdev-3.3.18}/PKG-INFO

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

@@ -6,7 +6,7 @@ Modules:
 - `nbdev.moddocs`: # Module docs: creating them from existing notebooks
 - `nbdev.skill`: Author nbdev notebooks as source, documentation, examples, and tests. Ensure this guidance is in context before any notebook edit."""
 
-__version__ = "3.3.17"
+__version__ = "3.3.18"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.17 → nbdev-3.3.18}/nbdev/_modidx.py

@@ -388,5 +388,7 @@ d = { 'settings': { 'branch': 'main',
             'nbdev.test': { 'nbdev.test._await_chain': ('api/test.html#_await_chain', 'nbdev/test.py'),
                             'nbdev.test._int_handler': ('api/test.html#_int_handler', 'nbdev/test.py'),
                             'nbdev.test._keep_file': ('api/test.html#_keep_file', 'nbdev/test.py'),
+                            'nbdev.test._skip_cell': ('api/test.html#_skip_cell', 'nbdev/test.py'),
+                            'nbdev.test.nb_test_cells': ('api/test.html#nb_test_cells', 'nbdev/test.py'),
                             'nbdev.test.nbdev_test': ('api/test.html#nbdev_test', 'nbdev/test.py'),
                             'nbdev.test.test_nb': ('api/test.html#test_nb', 'nbdev/test.py')}}}

{nbdev-3.3.17 → nbdev-3.3.18}/nbdev/test.py

@@ -5,10 +5,10 @@ Docs: https://nbdev.fast.ai/api/test.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/12_test.ipynb.
 
 # %% auto #0
-__all__ = ['test_nb', 'nbdev_test']
+__all__ = ['nb_test_cells', 'test_nb', 'nbdev_test']
 
 # %% ../nbs/api/12_test.ipynb #45e10c3f
-import time,os,sys,io,traceback,contextlib,inspect,signal,asyncio,threading
+import time,os,sys,io,traceback,contextlib,signal,asyncio,threading
 from fastcore.basics import *
 from fastcore.imports import *
 from fastcore.foundation import *
@@ -54,6 +54,29 @@ def _int_handler(signum, frame):
         os.write(2, f'\n=== nbdev-test interrupted: {_cur_nb[0]} ===\n{buf.getvalue()}'.encode())
     os._exit(130)
 
+# %% ../nbs/api/12_test.ipynb #b831e0b8
+def _skip_cell(nb, skip_flags=None, force_flags=None):
+    "Predicate for the cells of `nb` that `test_nb` leaves out"
+    fm = nb_frontmatter(nb)
+    if str2bool(fm.get('skip_exec', False)) or nb_lang(nb) != 'python': return lambda cell: True
+    flags = set(L(skip_flags)) - set(L(force_flags))
+    dflt = fm_default_eval(fm)
+    def _f(cell):
+        if cell.cell_type != 'code': return True
+        if not does_cell_eval(cell, dflt): return True
+        return flags & (getattr(cell, 'directives_', {}) or {}).keys()
+    return _f
+
+def nb_test_cells(
+    fn, # Notebook path
+    skip_flags=None, # Flags marking cells to skip
+    force_flags=None, # Flags marking cells to always run
+):
+    "The cells `test_nb` would run in the notebook at `fn`"
+    nb = NBProcessor(fn, rm_directives=False, process=True).nb
+    skip = _skip_cell(nb, skip_flags, force_flags)
+    return [c for c in nb.cells if not skip(c)]
+
 # %% ../nbs/api/12_test.ipynb #3f4fa1ad
 def test_nb(
     fn,  # file name of notebook to test
@@ -76,16 +99,10 @@ def test_nb(
     prev_test = os.environ.get('IN_TEST')
     if not IN_NOTEBOOK: os.environ['IN_TEST'] = '1'
     try:
-        flags=set(L(skip_flags)) - set(L(force_flags))
         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
-
-        dflt = fm_default_eval(fm)
-        def _no_eval(cell):
-            if cell.cell_type != 'code': return True
-            if not does_cell_eval(cell, dflt): return True
-            return flags & (getattr(cell, 'directives_', {}) or {}).keys()
+        _no_eval = _skip_cell(nb, skip_flags, force_flags)
 
         def _postproc(cell):
             elapsed = cell.metadata['execution']['total']
@@ -102,9 +119,9 @@ def test_nb(
                 if save: write_nb(nb, fn)
                 res = True
         except: 
-            if showerr: sys.stderr.write(k.prettytb(fname=fn)+'\n')
+            if showerr: sys.__stderr__.write((k.prettytb(fname=fn) or traceback.format_exc())+'\n')
             res=False
-        if k.leaks and showerr: sys.stderr.write(f'{fn}: {len(k.leaks)} leaked task(s) survived cancellation\n')
+        if k.leaks and showerr: sys.__stderr__.write(f'{fn}: {len(k.leaks)} leaked task(s) survived cancellation\n')
         if do_print: print(f'- Completed {fn}')
         return res,time.time()-start
     finally:
@@ -154,10 +171,12 @@ def nbdev_test(
     else: kw = {'method':'spawn'} if sys.platform=='darwin' else {}
     wd_pth = cfg.nbs_path
     with working_directory(wd_pth if (wd_pth and wd_pth.exists()) else os.getcwd()):
+        setup = cfg.get('test_setup')
+        if setup: import_obj(setup)([c for f in files for c in nb_test_cells(f, skip_flags, force_flags)])
         try:
             results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,
-                               basepath=cfg.config_path, pause=pause, do_print=do_print, verbose=verbose, save=save,
-                               cell_timeout=cell_timeout or None, cell_timing_min=cell_timing_min, **kw)
+                basepath=cfg.config_path, pause=pause, do_print=do_print, verbose=verbose, save=save,
+                cell_timeout=cell_timeout or None, cell_timing_min=cell_timing_min, **kw)
         except KeyboardInterrupt:
             sys.stderr.write('\nnbdev-test interrupted; in-flight notebook stacks shown above\n')
             sys.exit(130)

{nbdev-3.3.17 → nbdev-3.3.18/nbdev.egg-info}/PKG-INFO

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