nbdev 3.3.17__tar.gz → 3.3.19__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.17
+Version: 3.3.19
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.23
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: execnb>=0.3.3
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
@@ -35,7 +35,6 @@ Requires-Dist: pandas; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: svg.py; extra == "dev"
-Requires-Dist: nbclassic; extra == "dev"
 Requires-Dist: pysym2md>=0.0.6; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"

{nbdev-3.3.17 → nbdev-3.3.19}/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.19"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.17 → nbdev-3.3.19}/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.19}/nbdev/doclinks.py

@@ -129,12 +129,15 @@ def nbglob_cli(
     symlinks:bool=False, # Follow symlinks?
     file_glob:str='*.ipynb', # Only include files matching glob
     file_re:str=None, # Only include files matching regex
+    path_glob:str=None, # Only include files whose full paths match glob (wildcards match separators)
+    path_re:str=None, # Only include files whose full paths match regex
     folder_re:str=None, # Only enter folders matching regex
     skip_file_glob:str=None, # Skip files matching glob
     skip_file_re:str='^[_.]', # Skip files matching regex
     skip_folder_re:str = '^[_.]'): # Skip folders matching regex
     "Find all files in a directory matching an extension given a config key."
-    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,
+    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re,
+                  path_glob=path_glob, path_re=path_re, folder_re=folder_re,
                   skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re)
 
 # %% ../nbs/api/05_doclinks.ipynb #5e6fbe08

{nbdev-3.3.17 → nbdev-3.3.19}/nbdev/serve.py

@@ -87,7 +87,7 @@ def proc_nbs(
     (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'}
+    kw = {} if in_notebook() else {'method':'spawn'}
     parallel(nbdev.serve_drv.main, files, n_workers=n_workers, pause=0.01, **kw)
     if cache.exists(): cache.touch()
     return cache

{nbdev-3.3.17 → nbdev-3.3.19}/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
@@ -69,23 +92,17 @@ def test_nb(
     cell_timing_min:float=None # print cells slower than this many seconds (None: no timing output)
 ):
     "Execute tests in notebook in `fn` except those with `skip_flags`"
-    if not IN_NOTEBOOK and threading.current_thread() is threading.main_thread(): signal.signal(signal.SIGINT, _int_handler)
+    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'
+    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:
@@ -126,7 +143,7 @@ def _keep_file(
 @call_parse(pos=['path'])
 @delegates(nbglob_cli)
 def nbdev_test(
-    path:str=None,  # A notebook name or glob to test
+    path:str=None,  # A notebook, directory, or full-path glob to test
     flags:str='',  # Space separated list of test flags to run that are normally ignored
     n_workers:int=None,  # Number of workers
     timing:bool=False,  # Time each notebook to see which are slow
@@ -140,6 +157,7 @@ def nbdev_test(
     **kwargs
 ):
     "Test in parallel notebooks matching `path`, passing along `flags`"
+    if path and not Path(path).exists(): kwargs['path_glob'],path = os.path.abspath(path),Path.cwd()
     cfg = get_config(Path(path).resolve() if path else None)
     cell_timeout,cell_timing_min = ifnone(cell_timeout, cfg.cell_timeout),ifnone(cell_timing_min, cfg.get('cell_timing_min'))
     skip_flags = cfg.tst_flags
@@ -150,14 +168,16 @@ def nbdev_test(
     if len(files)==0: return print('No files were eligible for testing')
 
     if n_workers is None: n_workers = 0 if len(files)==1 else min(num_cpus(), 8)
-    if IN_NOTEBOOK: kw = {'method':'spawn'} if os.name=='nt' or sys.platform=='darwin' else {'method':'forkserver'}
+    if in_notebook(): kw = {'method':'spawn'} if os.name=='nt' or sys.platform=='darwin' else {'method':'forkserver'}
     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.19/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.17
+Version: 3.3.19
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.23
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: execnb>=0.3.3
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
@@ -35,7 +35,6 @@ Requires-Dist: pandas; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: svg.py; extra == "dev"
-Requires-Dist: nbclassic; extra == "dev"
 Requires-Dist: pysym2md>=0.0.6; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"

{nbdev-3.3.17 → nbdev-3.3.19}/nbdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=2.2.23
+fastcore>=2.2.28
 execnb>=0.3.3
 astunparse
 ghapi>=2.0.2
@@ -20,7 +20,6 @@ pandas
 matplotlib
 black
 svg.py
-nbclassic
 pysym2md>=0.0.6
 llms-txt
 sphinx

{nbdev-3.3.17 → nbdev-3.3.19}/pyproject.toml

@@ -19,12 +19,11 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 dynamic = ["version"]
-dependencies = [ "fastcore>=2.2.23", "execnb>=0.3.3", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
+dependencies = [ "fastcore>=2.2.28", "execnb>=0.3.3", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
     "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]
-dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "nbclassic",
-    "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", ]
+dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", ]
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/nbdev"