nbdev 3.3.7__tar.gz → 3.3.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.7
+Version: 3.3.9
 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.3
+Requires-Dist: fastcore>=2.2.7
 Requires-Dist: execnb>=0.2.11
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2

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

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

@@ -292,13 +292,6 @@ d = { 'settings': { 'branch': 'main',
             'nbdev.quarto': { 'nbdev.quarto.IndentDumper': ('api/quarto.html#indentdumper', 'nbdev/quarto.py'),
                               'nbdev.quarto.IndentDumper.increase_indent': ( 'api/quarto.html#indentdumper.increase_indent',
                                                                              'nbdev/quarto.py'),
-                              'nbdev.quarto._SidebarYmlRemoved': ('api/quarto.html#_sidebarymlremoved', 'nbdev/quarto.py'),
-                              'nbdev.quarto._SidebarYmlRemoved.__enter__': ( 'api/quarto.html#_sidebarymlremoved.__enter__',
-                                                                             'nbdev/quarto.py'),
-                              'nbdev.quarto._SidebarYmlRemoved.__exit__': ( 'api/quarto.html#_sidebarymlremoved.__exit__',
-                                                                            'nbdev/quarto.py'),
-                              'nbdev.quarto._SidebarYmlRemoved.__init__': ( 'api/quarto.html#_sidebarymlremoved.__init__',
-                                                                            'nbdev/quarto.py'),
                               'nbdev.quarto._chk_nbdev_yml': ('api/quarto.html#_chk_nbdev_yml', 'nbdev/quarto.py'),
                               'nbdev.quarto._copytree': ('api/quarto.html#_copytree', 'nbdev/quarto.py'),
                               'nbdev.quarto._doc_mtime_not_older': ('api/quarto.html#_doc_mtime_not_older', 'nbdev/quarto.py'),
@@ -315,6 +308,7 @@ d = { 'settings': { 'branch': 'main',
                               'nbdev.quarto._save_cached_readme': ('api/quarto.html#_save_cached_readme', 'nbdev/quarto.py'),
                               'nbdev.quarto._sort': ('api/quarto.html#_sort', 'nbdev/quarto.py'),
                               'nbdev.quarto._sprun': ('api/quarto.html#_sprun', 'nbdev/quarto.py'),
+                              'nbdev.quarto._strip_sidebar': ('api/quarto.html#_strip_sidebar', 'nbdev/quarto.py'),
                               'nbdev.quarto.fs_watchdog': ('api/quarto.html#fs_watchdog', 'nbdev/quarto.py'),
                               'nbdev.quarto.install': ('api/quarto.html#install', 'nbdev/quarto.py'),
                               'nbdev.quarto.install_quarto': ('api/quarto.html#install_quarto', 'nbdev/quarto.py'),

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

@@ -236,17 +236,16 @@ def _doc_mtime_not_older(readme_path, readme_nb_path):
     return readme_path.exists() and readme_path.stat().st_mtime>=readme_nb_path.stat().st_mtime
 
 # %% ../nbs/api/14_quarto.ipynb #7b70b5c8
-class _SidebarYmlRemoved:
-    "Context manager for `nbdev-readme` to avoid rendering whole docs website"
-    def __init__(self,path): self._path=path
-    def __enter__(self):
-        self._yml_path = self._path/'sidebar.yml'
-        self._moved=False
-        if self._yml_path.exists():
-            self._yml_path.rename(self._path/'sidebar.yml.bak')
-            self._moved=True
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        if self._moved: (self._path/'sidebar.yml.bak').rename(self._yml_path)
+def _strip_sidebar(cache):
+    "Drop website sidebar config from the staged copy at `cache`, so single-doc renders skip nav resolution (see quarto-dev/quarto-cli#14757)"
+    p = Path(cache)/'_quarto.yml'
+    if not p.exists(): return
+    cfg = yaml.safe_load(p.read_text())
+    (cfg.get('website') or {}).pop('sidebar', None)
+    mf = cfg.get('metadata-files')
+    if mf and 'sidebar.yml' in mf: mf.remove('sidebar.yml')
+    (Path(cache)/'sidebar.yml').unlink(missing_ok=True)
+    p.write_text(yaml.dump(cfg, sort_keys=False))
 
 # %% ../nbs/api/14_quarto.ipynb #49661bbf
 def _copytree(a,b):
@@ -285,12 +284,12 @@ def nbdev_readme(
     _chk_nbdev_yml(path)
     if chk_time and _doc_mtime_not_older(cfg.config_path/'README.md', path/cfg.readme_nb): return
 
-    with _SidebarYmlRemoved(path): # to avoid rendering whole website
-        cache = proc_nbs(path, file_glob=Path(cfg.readme_nb).name)
-        for f in _readme_cands(cache, cfg):
-            if f.exists(): f.unlink() # remove stale renders from either quarto layout
-        _sprun(f'cd "{cache}" && quarto render "{cache/cfg.readme_nb}" -o README.md -t gfm --no-execute -M wrap:preserve')
-        
+    cache = proc_nbs(path, file_glob=Path(cfg.readme_nb).name)
+    _strip_sidebar(cache)  # to avoid rendering whole website
+    for f in _readme_cands(cache, cfg):
+        if f.exists(): f.unlink() # remove stale renders from either quarto layout
+    _sprun(f'cd "{cache}" && quarto render "{cache/cfg.readme_nb}" -o README.md -t gfm --no-execute -M wrap:preserve')
+
     _save_cached_readme(cache, cfg)
 
 # %% ../nbs/api/14_quarto.ipynb #ef3f1e1f
@@ -319,9 +318,9 @@ def nbdev_contributing(
     if not contrib_nb_path.exists(): return
     if chk_time and _doc_mtime_not_older(cfg.config_path / 'CONTRIBUTING.md' , contrib_nb_path): return
     
-    with _SidebarYmlRemoved(path): # to avoid rendering whole website
-        cache = proc_nbs(path, file_glob=Path(contrib_nb_name).name)
-        _sprun(f'cd "{cache}" && quarto render "{cache/contrib_nb_name}" -o CONTRIBUTING.md -t gfm --no-execute -M wrap:preserve')
+    cache = proc_nbs(path, file_glob=Path(contrib_nb_name).name)
+    _strip_sidebar(cache)  # to avoid rendering whole website
+    _sprun(f'cd "{cache}" && quarto render "{cache/contrib_nb_name}" -o CONTRIBUTING.md -t gfm --no-execute -M wrap:preserve')
         
     _save_cached_contributing(cache, cfg, contrib_nb_name)
 

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

@@ -48,12 +48,11 @@ async def test_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 'nbdev_export'+'(' in cell.source: return True
-            direc = getattr(cell, 'directives_', {}) or {}
-            if direc.get('eval', '').lower() == 'false': return True
-            return flags & direc.keys()
+            if not does_cell_eval(cell, dflt): return True
+            return flags & (getattr(cell, 'directives_', {}) or {}).keys()
 
         start = time.time()
         if profile is None: profile = bool(get_config(fn.parent).exec_profile)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.7
+Version: 3.3.9
 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.3
+Requires-Dist: fastcore>=2.2.7
 Requires-Dist: execnb>=0.2.11
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2

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

@@ -1,4 +1,4 @@
-fastcore>=2.2.3
+fastcore>=2.2.7
 execnb>=0.2.11
 astunparse
 ghapi>=2.0.2

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

@@ -19,7 +19,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 dynamic = ["version"]
-dependencies = [ "fastcore>=2.2.3", "execnb>=0.2.11", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
+dependencies = [ "fastcore>=2.2.7", "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]