nbdev 3.3.5__tar.gz → 3.3.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.5
+Version: 3.3.6
 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.1.11
+Requires-Dist: fastcore>=2.2.3
 Requires-Dist: execnb>=0.2.8
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2

{nbdev-3.3.5 → nbdev-3.3.6}/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.6"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.5 → nbdev-3.3.6}/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'),

{nbdev-3.3.5 → nbdev-3.3.6}/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.6}/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.6}/nbdev/processors.py

@@ -18,7 +18,6 @@ from .process import *
 from .showdoc import *
 from .doclinks import *
 from .frontmatter import *
-from .frontmatter import _fm2dict
 
 from fastcore.nbio import *
 from execnb.shell import *

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.5
+Version: 3.3.6
 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.1.11
+Requires-Dist: fastcore>=2.2.3
 Requires-Dist: execnb>=0.2.8
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2

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

@@ -1,4 +1,4 @@
-fastcore>=2.1.11
+fastcore>=2.2.3
 execnb>=0.2.8
 astunparse
 ghapi>=2.0.2

{nbdev-3.3.5 → nbdev-3.3.6}/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.8", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
     "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]