nbdev 3.3.9__tar.gz → 3.3.11__tar.gz

{nbdev-3.3.9/nbdev.egg-info → nbdev-3.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.9
+Version: 3.3.11
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore>=2.2.7
-Requires-Dist: execnb>=0.2.11
+Requires-Dist: execnb>=0.3.2
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
 Requires-Dist: watchdog

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev/__init__.py

@@ -6,7 +6,7 @@ Modules:
 - `nbdev.moddocs`: # Module docs: creating them from existing notebooks
 - `nbdev.skill`: Author clear, executable nbdev notebooks where code, prose, examples, outputs, and tests form one coherent narrative."""
 
-__version__ = "3.3.9"
+__version__ = "3.3.11"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev/_modidx.py

@@ -378,7 +378,8 @@ d = { 'settings': { 'branch': 'main',
                             'nbdev.sync._update_nb': ('api/sync.html#_update_nb', 'nbdev/sync.py'),
                             'nbdev.sync.absolute_import': ('api/sync.html#absolute_import', 'nbdev/sync.py'),
                             'nbdev.sync.nbdev_update': ('api/sync.html#nbdev_update', 'nbdev/sync.py')},
-            'nbdev.test': { 'nbdev.test._keep_file': ('api/test.html#_keep_file', 'nbdev/test.py'),
-                            'nbdev.test._test_nb_sync': ('api/test.html#_test_nb_sync', 'nbdev/test.py'),
+            '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.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.9 → nbdev-3.3.11}/nbdev/processors.py

@@ -12,8 +12,6 @@ __all__ = ['populate_language', 'insert_warning', 'cell_lang', 'add_show_docs',
 # %% ../nbs/api/10_processors.ipynb #2398f5ef-06d3-4890-8a54-7cf4f81f3894
 import ast
 
-from fastcore.aio import run_sync
-
 from .config import *
 from .imports import *
 from .process import *
@@ -257,7 +255,7 @@ class exec_show_docs(Processor):
         if not self.nb.has_docs_ or not hasattr(self, 'k'): return
         fm = getattr(self.nb, 'frontmatter_', {})
         if str2bool(fm.get('skip_showdoc', False)): return
-        if _do_eval(cell): run_sync(self.k.cell(cell))
+        if _do_eval(cell): self.k.cell(cell)
         title = fm.get('title', '')
         if self.k.exc: 
             raise Exception(f"Error{' in notebook: '+title if title else ''} in cell {cell.idx_} :\n{cell.source}") from self.k.exc

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev/serve.py

@@ -84,6 +84,7 @@ def proc_nbs(
     cache.mkdir(parents=True, exist_ok=True)
     cache_mtime = cache.stat().st_mtime
     if force or (cache.exists() and cache_mtime<chk_mtime): rmtree(cache)
+    (cache/'_quarto.yml').unlink(missing_ok=True)  # single-doc renders strip the staged copy in place (`_strip_sidebar`), so always restage it
 
     files = files.map(_proc_file, mtime=cache_mtime, cache=cache, path=path).filter()
     kw = {} if IN_NOTEBOOK else {'method':'spawn'}

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev/test.py

@@ -8,7 +8,7 @@ Docs: https://nbdev.fast.ai/api/test.html.md"""
 __all__ = ['test_nb', 'nbdev_test']
 
 # %% ../nbs/api/12_test.ipynb #45e10c3f
-import time,os,sys,traceback,contextlib,inspect,faulthandler,signal,asyncio
+import time,os,sys,io,traceback,contextlib,inspect,signal,asyncio,threading
 from fastcore.basics import *
 from fastcore.imports import *
 from fastcore.foundation import *
@@ -24,8 +24,38 @@ from .frontmatter import nb_frontmatter
 from fastcore.nbio import *
 from execnb.shell import *
 
+# %% ../nbs/api/12_test.ipynb #dc8994ac
+_cur_nb = [None]
+_cur_shell = [None]
+
+def _await_chain(t):
+    "One frame per coroutine in task `t`'s await chain, deepest last: where a suspended hang actually sits"
+    co = t.get_coro()
+    while co is not None:
+        f = getattr(co, 'cr_frame', None) or getattr(co, 'ag_frame', None) or getattr(co, 'gi_frame', None)
+        if f is not None: yield f, f.f_lineno
+        co = getattr(co, 'cr_await', None) or getattr(co, 'ag_await', None) or getattr(co, 'gi_yieldfrom', None)
+
+def _int_handler(signum, frame):
+    "Dump the running notebook's stack and exit; installed on SIGINT by `test_nb`"
+    if _cur_nb[0] is not None:
+        buf = io.StringIO()
+        traceback.print_stack(frame, file=buf)
+        k = _cur_shell[0]
+        if k is not None:
+            f = sys._current_frames().get(k._thread.ident)
+            if f is not None:
+                print('\n--- shell loop thread ---', file=buf)
+                traceback.print_stack(f, file=buf)
+            with contextlib.suppress(RuntimeError):
+                for t in asyncio.all_tasks(k.loop):
+                    print(f'\n{t}', file=buf)
+                    buf.writelines(traceback.StackSummary.extract(_await_chain(t)).format())
+        os.write(2, f'\n=== nbdev-test interrupted: {_cur_nb[0]} ===\n{buf.getvalue()}'.encode())
+    os._exit(130)
+
 # %% ../nbs/api/12_test.ipynb #3f4fa1ad
-async def test_nb(
+def test_nb(
     fn,  # file name of notebook to test
     skip_flags=None,  # list of flags marking cells to skip
     force_flags=None,  # list of flags marking cells to always run
@@ -34,11 +64,13 @@ async def test_nb(
     basepath=None,  # path to add to sys.path
     verbose=False,  # stream stdout/stderr from cells to console?
     save=False,  # write outputs back to notebook on success?
-    profile:bool=None # load the IPython profile, as `ipykernel` does? (default: `exec_profile` config key)
+    profile:bool=None, # load the IPython profile, as `ipykernel` does? (default: `exec_profile` config key)
+    cell_timeout:int=600  # seconds before each cell times out (None: no limit)
 ):
     "Execute tests in notebook in `fn` except those with `skip_flags`"
-    faulthandler.register(signal.SIGINT, file=sys.__stderr__, all_threads=True, chain=True)
+    if not IN_NOTEBOOK and threading.current_thread() is threading.main_thread(): signal.signal(signal.SIGINT, _int_handler)
     fn = Path(fn)
+    _cur_nb[0] = fn
     if basepath: sys.path.insert(0, str(basepath))
     prev_test = os.environ.get('IN_TEST')
     if not IN_NOTEBOOK: os.environ['IN_TEST'] = '1'
@@ -57,25 +89,25 @@ async def test_nb(
         start = time.time()
         if profile is None: profile = bool(get_config(fn.parent).exec_profile)
         k = CaptureShell(fn, profile=profile)
+        _cur_shell[0] = k
         if do_print: print(f'Starting {fn}')
         try:
             with working_directory(fn.parent):
-                await k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose)
+                k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose, cell_timeout=cell_timeout)
                 if save: write_nb(nb, fn)
                 res = True
         except: 
             if showerr: sys.stderr.write(k.prettytb(fname=fn)+'\n')
             res=False
+        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:
+        _cur_nb[0] = _cur_shell[0] = None
         if prev_test is None: os.environ.pop('IN_TEST', None)
         else: os.environ['IN_TEST'] = prev_test
 
 
-# %% ../nbs/api/12_test.ipynb #12516e0a
-def _test_nb_sync(fn, **kwargs): return asyncio.run(test_nb(fn, **kwargs))
-
 # %% ../nbs/api/12_test.ipynb #d8bf1f1b-935d-4b69-ba96-827c5d7213f0
 def _keep_file(
     p:Path, # filename for which to check for `indicator_fname`
@@ -98,6 +130,7 @@ def nbdev_test(
     ignore_fname:str='.notest', # Filename that will result in siblings being ignored
     verbose:bool=False, # Print stdout/stderr from notebook cells?
     save:bool=False, # Write outputs back to notebooks on success?
+    cell_timeout:int=600, # Seconds before each cell times out (0: no limit)
     **kwargs
 ):
     "Test in parallel notebooks matching `path`, passing along `flags`"
@@ -114,8 +147,13 @@ 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()):
-        results = parallel(_test_nb_sync, 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, **kw)
+        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, **kw)
+        except KeyboardInterrupt:
+            sys.stderr.write('\nnbdev-test interrupted; in-flight notebook stacks shown above\n')
+            sys.exit(130)
     passed,times = zip(*results)
     if all(passed): print("Success.")
     else: 

{nbdev-3.3.9 → nbdev-3.3.11/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.9
+Version: 3.3.11
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore>=2.2.7
-Requires-Dist: execnb>=0.2.11
+Requires-Dist: execnb>=0.3.2
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
 Requires-Dist: watchdog

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev.egg-info/requires.txt

@@ -1,5 +1,5 @@
 fastcore>=2.2.7
-execnb>=0.2.11
+execnb>=0.3.2
 astunparse
 ghapi>=2.0.2
 watchdog

{nbdev-3.3.9 → nbdev-3.3.11}/pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 dynamic = ["version"]
-dependencies = [ "fastcore>=2.2.7", "execnb>=0.2.11", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
+dependencies = [ "fastcore>=2.2.7", "execnb>=0.3.2", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
     "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]

{nbdev-3.3.9 → nbdev-3.3.11}/nbdev/quarto.py

@@ -339,9 +339,9 @@ def nbdev_docs(
     **kwargs):
     "Create Quarto docs and README.md"
     cache,cfg,path = _pre_docs(path, n_workers=n_workers, **kwargs)
+    _sprun(f'cd "{cache}" && quarto render --no-cache')
     nbdev_readme.__wrapped__(path=path, chk_time=True)
     nbdev_contributing.__wrapped__(path=path, chk_time=True)
-    _sprun(f'cd "{cache}" && quarto render --no-cache')
     shutil.rmtree(cfg.doc_path, ignore_errors=True)
     move(cache/cfg.doc_path.name, cfg.config_path)
     _fix_quarto_nav(cfg.doc_path)