nbdev 3.3.5__tar.gz → 3.3.7__tar.gz

{nbdev-3.3.5/nbdev.egg-info → nbdev-3.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.5
+Version: 3.3.7
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,8 +16,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.1.11
-Requires-Dist: execnb>=0.2.8
+Requires-Dist: fastcore>=2.2.3
+Requires-Dist: execnb>=0.2.11
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
 Requires-Dist: watchdog

{nbdev-3.3.5 → nbdev-3.3.7}/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.5"
+__version__ = "3.3.7"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.5 → nbdev-3.3.7}/nbdev/_modidx.py

@@ -141,10 +141,8 @@ d = { 'settings': { 'branch': 'main',
                                    'nbdev.frontmatter.FrontmatterProc.end': ( 'api/frontmatter.html#frontmatterproc.end',
                                                                               'nbdev/frontmatter.py'),
                                    'nbdev.frontmatter._dict2fm': ('api/frontmatter.html#_dict2fm', 'nbdev/frontmatter.py'),
-                                   'nbdev.frontmatter._fm2dict': ('api/frontmatter.html#_fm2dict', 'nbdev/frontmatter.py'),
-                                   'nbdev.frontmatter._insertfm': ('api/frontmatter.html#_insertfm', 'nbdev/frontmatter.py'),
-                                   'nbdev.frontmatter._md2dict': ('api/frontmatter.html#_md2dict', 'nbdev/frontmatter.py'),
-                                   'nbdev.frontmatter.nb_frontmatter': ('api/frontmatter.html#nb_frontmatter', 'nbdev/frontmatter.py')},
+                                   'nbdev.frontmatter._fm2dict_md': ('api/frontmatter.html#_fm2dict_md', 'nbdev/frontmatter.py'),
+                                   'nbdev.frontmatter._insertfm': ('api/frontmatter.html#_insertfm', 'nbdev/frontmatter.py')},
             'nbdev.imports': {},
             'nbdev.maker': { 'nbdev.maker.ModuleMaker': ('api/maker.html#modulemaker', 'nbdev/maker.py'),
                              'nbdev.maker.ModuleMaker.__init__': ('api/maker.html#modulemaker.__init__', 'nbdev/maker.py'),
@@ -387,5 +385,6 @@ d = { 'settings': { 'branch': 'main',
                             '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': ('api/test.html#nbdev_test', 'nbdev/test.py'),
                             'nbdev.test.test_nb': ('api/test.html#test_nb', 'nbdev/test.py')}}}

{nbdev-3.3.5 → nbdev-3.3.7}/nbdev/frontmatter.py

@@ -5,7 +5,7 @@ Docs: https://nbdev.fast.ai/api/frontmatter.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/09_frontmatter.ipynb.
 
 # %% auto #0
-__all__ = ['nb_frontmatter', 'FrontmatterProc']
+__all__ = ['FrontmatterProc']
 
 # %% ../nbs/api/09_frontmatter.ipynb #2398f5ef-06d3-4890-8a54-7cf4f81f3894
 from .imports import *
@@ -21,38 +21,15 @@ _RE_FM_BASE=r'''^---\s*
 (.*?\S+.*?)
 ---\s*'''
 
-_re_fm_nb = re.compile(_RE_FM_BASE+'$', flags=re.DOTALL)
 _re_fm_md = re.compile(_RE_FM_BASE, flags=re.DOTALL)
 
+
 # %% ../nbs/api/09_frontmatter.ipynb #1725f3b9
-def _fm2dict(s:str, nb=True):
-    "Load YAML frontmatter into a `dict`"
-    re_fm = _re_fm_nb if nb else _re_fm_md
-    match = re_fm.search(s.strip())
+def _fm2dict_md(s:str):
+    "Load YAML frontmatter opening a markdown file (body allowed) into a `dict`"
+    match = _re_fm_md.search(s.strip())
     return yaml.safe_load(match.group(1)) if match else {}
 
-def _md2dict(s:str):
-    "Convert H1 formatted markdown cell to frontmatter dict"
-    if '#' not in s: return {}
-    m = re.search(r'^#\s+(\S.*?)\s*$', s, flags=re.MULTILINE)
-    if not m: return {}
-    res = {'title': m.group(1)}
-    m = re.search(r'^>\s+(\S.*?)\s*$', s, flags=re.MULTILINE)
-    if m: res['description'] = m.group(1)
-    r = re.findall(r'^-\s+(\S.*:.*\S)\s*$', s, flags=re.MULTILINE)
-    if r:
-        try: res.update(yaml.safe_load('\n'.join(r)))
-        except Exception as e: warn(f'Failed to create YAML dict for:\n{r}\n\n{e}\n')
-    return res
-
-# %% ../nbs/api/09_frontmatter.ipynb #4ba11b21
-def nb_frontmatter(nb):
-    "Get frontmatter dict from `nb` without modifying cells"
-    raw = first(c for c in nb.cells if c.cell_type=='raw')
-    md  = first(c for c in nb.cells if c.cell_type=='markdown')
-    res = _md2dict(md.source) if md else {}
-    if raw: res.update(_fm2dict(raw.source))
-    return res
 
 # %% ../nbs/api/09_frontmatter.ipynb #1b5d9d32
 def _dict2fm(d): return f'---\n{yaml.dump(d)}\n---\n\n'
@@ -71,8 +48,8 @@ class FrontmatterProc(Processor):
         cell.source = None
 
     def cell(self, cell):
-        if cell.cell_type=='raw': self._update(_fm2dict, cell)
-        elif cell.cell_type=='markdown' and 'title' not in self.fm: self._update(_md2dict, cell)
+        if cell.cell_type=='raw': self._update(cell_frontmatter, cell)
+        elif cell.cell_type=='markdown' and 'title' not in self.fm: self._update(md_frontmatter, cell)
 
     def end(self):
         self.nb.frontmatter_ = self.fm

{nbdev-3.3.5 → nbdev-3.3.7}/nbdev/migrate.py

@@ -11,7 +11,7 @@ __all__ = ['MigrateProc', 'fp_md_fm', 'migrate_nb', 'migrate_md', 'nbdev_migrate
 from .process import *
 from fastcore.nbio import first_code_ln, langs
 from .frontmatter import *
-from .frontmatter import _fm2dict, _re_fm_md, _dict2fm, _insertfm
+from .frontmatter import _fm2dict_md, _re_fm_md, _dict2fm, _insertfm
 from .processors import *
 from .config import get_config, read_nb, set_version, pyproject_tmpl, nbdev_defaults
 from .sync import write_nb
@@ -98,7 +98,7 @@ def fp_md_fm(path):
     "Make fastpages front matter in markdown files quarto compliant."
     p = Path(path)
     md = p.read_text()
-    fm = _fm2dict(md, nb=False)
+    fm = _fm2dict_md(md)
     if fm:
         fm = _fp_convert(fm, path)
         return _re_fm_md.sub(_dict2fm(fm), md)

{nbdev-3.3.5 → nbdev-3.3.7}/nbdev/processors.py

@@ -12,13 +12,14 @@ __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 *
 from .showdoc import *
 from .doclinks import *
 from .frontmatter import *
-from .frontmatter import _fm2dict
 
 from fastcore.nbio import *
 from execnb.shell import *
@@ -256,7 +257,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): self.k.cell(cell)
+        if _do_eval(cell): run_sync(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.5 → nbdev-3.3.7}/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
+import time,os,sys,traceback,contextlib,inspect,faulthandler,signal,asyncio
 from fastcore.basics import *
 from fastcore.imports import *
 from fastcore.foundation import *
@@ -25,7 +25,7 @@ from fastcore.nbio import *
 from execnb.shell import *
 
 # %% ../nbs/api/12_test.ipynb #3f4fa1ad
-def test_nb(
+async 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
@@ -61,7 +61,7 @@ def test_nb(
         if do_print: print(f'Starting {fn}')
         try:
             with working_directory(fn.parent):
-                k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose)
+                await k.run_all(nb, exc_stop=True, preproc=_no_eval, verbose=verbose)
                 if save: write_nb(nb, fn)
                 res = True
         except: 
@@ -74,6 +74,9 @@ def test_nb(
         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`
@@ -112,7 +115,7 @@ 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, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,
+        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)
     passed,times = zip(*results)
     if all(passed): print("Success.")

{nbdev-3.3.5 → nbdev-3.3.7/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.5
+Version: 3.3.7
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,8 +16,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.1.11
-Requires-Dist: execnb>=0.2.8
+Requires-Dist: fastcore>=2.2.3
+Requires-Dist: execnb>=0.2.11
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
 Requires-Dist: watchdog

{nbdev-3.3.5 → nbdev-3.3.7}/nbdev.egg-info/requires.txt

@@ -1,5 +1,5 @@
-fastcore>=2.1.11
-execnb>=0.2.8
+fastcore>=2.2.3
+execnb>=0.2.11
 astunparse
 ghapi>=2.0.2
 watchdog

{nbdev-3.3.5 → nbdev-3.3.7}/pyproject.toml

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