nbdev 2.3.34__tar.gz → 2.4.9__tar.gz

{nbdev-2.3.34/nbdev.egg-info → nbdev-2.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nbdev
-Version: 2.3.34
+Version: 2.4.9
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/AnswerDotAI/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -11,24 +11,24 @@ Keywords: nbdev fastai jupyter notebook export
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging
-Requires-Dist: fastcore>=1.5.27
-Requires-Dist: execnb>=0.1.4
+Requires-Dist: fastcore>=1.11.0
+Requires-Dist: execnb>=0.1.12
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=1.0.3
 Requires-Dist: watchdog
 Requires-Dist: asttokens
 Requires-Dist: setuptools
+Requires-Dist: build
+Requires-Dist: fastgit
 Requires-Dist: PyYAML
 Provides-Extra: dev
 Requires-Dist: ipywidgets; extra == "dev"
@@ -42,6 +42,21 @@ Requires-Dist: nbclassic; extra == "dev"
 Requires-Dist: pysymbol_llm; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: plum-dispatch; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Getting Started
 

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.3.34"
+__version__ = "2.4.9"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/_modidx.py

@@ -1,6 +1,6 @@
 # Autogenerated by nbdev
 
-d = { 'settings': { 'branch': 'master',
+d = { 'settings': { 'branch': 'main',
                 'doc_baseurl': '/',
                 'doc_host': 'https://nbdev.fast.ai',
                 'git_url': 'https://github.com/AnswerDotAI/nbdev',
@@ -46,8 +46,16 @@ d = { 'settings': { 'branch': 'master',
                               'nbdev.config.is_nbdev': ('api/config.html#is_nbdev', 'nbdev/config.py'),
                               'nbdev.config.nbdev_create_config': ('api/config.html#nbdev_create_config', 'nbdev/config.py'),
                               'nbdev.config.show_src': ('api/config.html#show_src', 'nbdev/config.py'),
+                              'nbdev.config.update_proj': ('api/config.html#update_proj', 'nbdev/config.py'),
                               'nbdev.config.update_version': ('api/config.html#update_version', 'nbdev/config.py'),
                               'nbdev.config.write_cells': ('api/config.html#write_cells', 'nbdev/config.py')},
+            'nbdev.diff': { 'nbdev.diff._cell_changes': ('api/diff.html#_cell_changes', 'nbdev/diff.py'),
+                            'nbdev.diff._nb_srcdict': ('api/diff.html#_nb_srcdict', 'nbdev/diff.py'),
+                            'nbdev.diff.cell_diffs': ('api/diff.html#cell_diffs', 'nbdev/diff.py'),
+                            'nbdev.diff.changed_cells': ('api/diff.html#changed_cells', 'nbdev/diff.py'),
+                            'nbdev.diff.nbs_pair': ('api/diff.html#nbs_pair', 'nbdev/diff.py'),
+                            'nbdev.diff.read_nb_from_git': ('api/diff.html#read_nb_from_git', 'nbdev/diff.py'),
+                            'nbdev.diff.source_diff': ('api/diff.html#source_diff', 'nbdev/diff.py')},
             'nbdev.doclinks': { 'nbdev.doclinks.NbdevLookup': ('api/doclinks.html#nbdevlookup', 'nbdev/doclinks.py'),
                                 'nbdev.doclinks.NbdevLookup.__getitem__': ( 'api/doclinks.html#nbdevlookup.__getitem__',
                                                                             'nbdev/doclinks.py'),
@@ -257,20 +265,22 @@ d = { 'settings': { 'branch': 'master',
                               'nbdev.quarto._SidebarYmlRemoved.__init__': ( 'api/quarto.html#_sidebarymlremoved.__init__',
                                                                             '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'),
                               'nbdev.quarto._ensure_quarto': ('api/quarto.html#_ensure_quarto', 'nbdev/quarto.py'),
                               'nbdev.quarto._install_linux': ('api/quarto.html#_install_linux', 'nbdev/quarto.py'),
                               'nbdev.quarto._install_mac': ('api/quarto.html#_install_mac', 'nbdev/quarto.py'),
                               'nbdev.quarto._nbglob_docs': ('api/quarto.html#_nbglob_docs', 'nbdev/quarto.py'),
                               'nbdev.quarto._pre': ('api/quarto.html#_pre', 'nbdev/quarto.py'),
                               'nbdev.quarto._pre_docs': ('api/quarto.html#_pre_docs', 'nbdev/quarto.py'),
-                              'nbdev.quarto._readme_mtime_not_older': ('api/quarto.html#_readme_mtime_not_older', 'nbdev/quarto.py'),
                               'nbdev.quarto._recursive_parser': ('api/quarto.html#_recursive_parser', 'nbdev/quarto.py'),
+                              'nbdev.quarto._save_cached_contributing': ('api/quarto.html#_save_cached_contributing', 'nbdev/quarto.py'),
                               '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.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.quarto.nbdev_contributing': ('api/quarto.html#nbdev_contributing', 'nbdev/quarto.py'),
                               'nbdev.quarto.nbdev_docs': ('api/quarto.html#nbdev_docs', 'nbdev/quarto.py'),
                               'nbdev.quarto.nbdev_preview': ('api/quarto.html#nbdev_preview', 'nbdev/quarto.py'),
                               'nbdev.quarto.nbdev_proc_nbs': ('api/quarto.html#nbdev_proc_nbs', 'nbdev/quarto.py'),
@@ -319,37 +329,9 @@ d = { 'settings': { 'branch': 'master',
                                'nbdev.showdoc.BasicMarkdownRenderer': ('api/showdoc.html#basicmarkdownrenderer', 'nbdev/showdoc.py'),
                                'nbdev.showdoc.BasicMarkdownRenderer._repr_markdown_': ( 'api/showdoc.html#basicmarkdownrenderer._repr_markdown_',
                                                                                         'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl': ('api/showdoc.html#docmenttbl', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.__eq__': ('api/showdoc.html#docmenttbl.__eq__', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.__init__': ('api/showdoc.html#docmenttbl.__init__', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl._columns': ('api/showdoc.html#docmenttbl._columns', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl._hdr_list': ('api/showdoc.html#docmenttbl._hdr_list', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl._repr_markdown_': ( 'api/showdoc.html#docmenttbl._repr_markdown_',
-                                                                             'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl._row': ('api/showdoc.html#docmenttbl._row', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl._row_list': ('api/showdoc.html#docmenttbl._row_list', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.has_docment': ('api/showdoc.html#docmenttbl.has_docment', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.has_return': ('api/showdoc.html#docmenttbl.has_return', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.hdr_str': ('api/showdoc.html#docmenttbl.hdr_str', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.params_str': ('api/showdoc.html#docmenttbl.params_str', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.DocmentTbl.return_str': ('api/showdoc.html#docmenttbl.return_str', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.ShowDocRenderer': ('api/showdoc.html#showdocrenderer', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc.ShowDocRenderer.__init__': ('api/showdoc.html#showdocrenderer.__init__', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._bold': ('api/showdoc.html#_bold', 'nbdev/showdoc.py'),
                                'nbdev.showdoc._create_html_table': ('api/showdoc.html#_create_html_table', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._docstring': ('api/showdoc.html#_docstring', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._escape_markdown': ('api/showdoc.html#_escape_markdown', 'nbdev/showdoc.py'),
                                'nbdev.showdoc._ext_link': ('api/showdoc.html#_ext_link', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._f_name': ('api/showdoc.html#_f_name', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._fmt_anno': ('api/showdoc.html#_fmt_anno', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._fmt_sig': ('api/showdoc.html#_fmt_sig', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._fullname': ('api/showdoc.html#_fullname', 'nbdev/showdoc.py'),
                                'nbdev.showdoc._html_link': ('api/showdoc.html#_html_link', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._list2row': ('api/showdoc.html#_list2row', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._maybe_nm': ('api/showdoc.html#_maybe_nm', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._non_empty_keys': ('api/showdoc.html#_non_empty_keys', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._show_param': ('api/showdoc.html#_show_param', 'nbdev/showdoc.py'),
-                               'nbdev.showdoc._wrap_sig': ('api/showdoc.html#_wrap_sig', 'nbdev/showdoc.py'),
                                'nbdev.showdoc.colab_link': ('api/showdoc.html#colab_link', 'nbdev/showdoc.py'),
                                'nbdev.showdoc.doc': ('api/showdoc.html#doc', 'nbdev/showdoc.py'),
                                'nbdev.showdoc.show_doc': ('api/showdoc.html#show_doc', 'nbdev/showdoc.py'),

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/clean.py

@@ -69,7 +69,7 @@ def _clean_cell_output(cell, clean_ids):
             if k.startswith('text') and clean_ids: data[k] = _clean_cell_output_id(data[k])
             if k.startswith('image') and "svg" not in k: data[k] = data[k].rstrip()
         if 'text' in o and clean_ids: o['text'] = _clean_cell_output_id(o['text'])
-        o.get('metadata', {}).pop('tags', None)
+#         o.get('metadata', {}).pop('tags', None)
 
 # %% ../nbs/api/11_clean.ipynb
 def _clean_cell(cell, clear_all, allowed_metadata_keys, clean_ids):

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/cli.py

@@ -13,7 +13,7 @@ from .processors import *
 from .doclinks import *
 from .test import *
 from .clean import *
-from .quarto import nbdev_readme, refresh_quarto_yml, fs_watchdog
+from .quarto import nbdev_readme, nbdev_contributing, refresh_quarto_yml, fs_watchdog
 from .export import nb_export
 from .frontmatter import FrontmatterProc
 
@@ -91,7 +91,7 @@ def nbdev_new(**kwargs):
     _update_repo_meta(cfg)
     path = Path()
 
-    _ORG_OR_USR,_REPOSITORY = 'fastai','nbdev-template'
+    _ORG_OR_USR,_REPOSITORY = 'answerdotai','nbdev-template'
     _TEMPLATE = f'{_ORG_OR_USR}/{_REPOSITORY}'
     template = kwargs.get('template', _TEMPLATE)
     try: org_or_usr, repo = template.split('/')
@@ -101,7 +101,8 @@ def nbdev_new(**kwargs):
     if tag is None:
         with warnings.catch_warnings():
             warnings.simplefilter('ignore', UserWarning)
-            tag = GhApi(gh_host='https://api.github.com', authenticate=False).repos.get_latest_release(org_or_usr, repo).tag_name
+            tag = GhApi(gh_host='https://api.github.com', authenticate=False
+                       ).repos.get_latest_release(org_or_usr, repo).tag_name
 
     url = f"https://github.com/{org_or_usr}/{repo}/archive/{tag}.tar.gz"
     extract_tgz(url)
@@ -121,6 +122,7 @@ def nbdev_new(**kwargs):
     refresh_quarto_yml()
     nbdev_export.__wrapped__()
     nbdev_readme.__wrapped__()
+    nbdev_contributing.__wrapped__()
 
 # %% ../nbs/api/13_cli.ipynb
 mapping = {
@@ -183,10 +185,16 @@ def watch_export(nbs:str=None, # Nb directory to watch for changes
     lib = lib or (cfg.lib_path if cfg else '.')
     if cfg and (nbs != cfg.nbs_path or lib != cfg.lib_path) and not force:
         raise ValueError("In nbdev project. Use --force to override config.")
+    run(f'nbdev_export')
     def _export(e,lib=lib):
         p = e.src_path
-        if (not '.ipynb_checkpoints' in p and p.endswith('.ipynb') and not Path(p).name.startswith('.~')):
-            if e.event_type == 'modified': run(f'nb_export --lib_path {lib} "{p}"')
+        if (not '.ipynb_checkpoints' in p and p.endswith('.ipynb') and not Path(p).name.startswith(('tmp','.~'))):
+            if e.event_type == 'modified':
+                time.sleep(0.1)
+                try: run(f'nb_export --lib_path {lib} "{p}"')
+                except IOError:
+                    time.sleep(0.3)
+                    run(f'nb_export --lib_path {lib} "{p}"')
     with fs_watchdog(_export, nbs):
         while True: time.sleep(1)
 

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/config.py

@@ -3,8 +3,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_config.ipynb.
 
 # %% auto 0
-__all__ = ['nbdev_create_config', 'get_config', 'config_key', 'is_nbdev', 'create_output', 'show_src', 'update_version',
-           'add_init', 'write_cells']
+__all__ = ['pyproj_tmpl', 'nbdev_create_config', 'get_config', 'config_key', 'is_nbdev', 'create_output', 'show_src',
+           'update_version', 'update_proj', 'add_init', 'write_cells']
 
 # %% ../nbs/api/01_config.ipynb
 from datetime import datetime
@@ -49,7 +49,7 @@ def _apply_defaults(
     license='apache2', # License for the package
     copyright:str=None, # Copyright for the package, defaults to '`current_year` onwards, `author`'
     status='3', # Development status PyPI classifier
-    min_python='3.7', # Minimum Python version PyPI classifier
+    min_python='3.9', # Minimum Python version PyPI classifier
     audience='Developers', # Intended audience PyPI classifier
     language='English', # Language PyPI classifier
     recursive:bool_arg=True, # Include subfolders in notebook globs?
@@ -63,6 +63,7 @@ def _apply_defaults(
     clear_all:bool_arg=False, # Remove all cell metadata and cell outputs?
     cell_number:bool_arg=True, # Add cell number to the exported file
     put_version_in_init:bool_arg=True, # Add the version to the main __init__.py in nbdev_export
+    update_pyproject:bool_arg=True, # Create/update pyproject.toml with correct project name
     skip_procs:str='', # A comma-separated list of processors that you want to skip
 ):
     "Apply default settings where missing in `cfg`."
@@ -142,7 +143,7 @@ _nbdev_cfg_head = '''# All sections below are required unless otherwise specifie
 
 '''
 _nbdev_cfg_sections = {'Python library': 'repo lib_name version min_python license black_formatting',
-                       'nbdev': 'doc_path lib_path nbs_path recursive tst_flags put_version_in_init',
+                       'nbdev': 'doc_path lib_path nbs_path recursive tst_flags put_version_in_init update_pyproject',
                        'Docs': 'branch custom_sidebar doc_host doc_baseurl git_url title',
                        'PyPI': 'audience author author_email copyright description keywords language status user'}
 _nbdev_cfg_tail = '''### Optional ###
@@ -219,9 +220,26 @@ def create_output(txt, mime):
 # %% ../nbs/api/01_config.ipynb
 def show_src(src, lang='python'): return Markdown(f'```{lang}\n{src}\n```')
 
+# %% ../nbs/api/01_config.ipynb
+pyproj_tmpl = """[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "FILL_IN"
+requires-python="FILL_IN"
+dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]
+"""
+
 # %% ../nbs/api/01_config.ipynb
 _re_version = re.compile(r'^__version__\s*=.*$', re.MULTILINE)
+_re_proj = re.compile(r'^name\s*=\s*".*$', re.MULTILINE)
+_re_reqpy = re.compile(r'^requires-python\s*=\s*".*$', re.MULTILINE)
 _init = '__init__.py'
+_pyproj = 'pyproject.toml'
 
 def update_version(path=None):
     "Add or update `__version__` in the main `__init__.py` of the library."
@@ -236,6 +254,15 @@ def update_version(path=None):
 
 def _has_py(fs): return any(1 for f in fs if f.endswith('.py'))
 
+def update_proj(path):
+    "Create or update `pyproject.toml` in the project root."
+    fname = path/_pyproj
+    if not fname.exists(): fname.write_text(pyproj_tmpl)
+    txt = fname.read_text()
+    txt = _re_proj.sub(f'name="{get_config().lib_name}"', txt)
+    txt = _re_reqpy.sub(f'requires-python=">={get_config().min_python}"', txt)
+    fname.write_text(txt)
+
 def add_init(path=None):
     "Add `__init__.py` in all subdirs of `path` containing python files if it's not there already."
     # we add the lowest-level `__init__.py` files first, which ensures _has_py succeeds for parent modules
@@ -247,14 +274,15 @@ def add_init(path=None):
         subds = (os.listdir(r/d) for d in ds)
         if _has_py(fs) or any(filter(_has_py, subds)) and not (r/_init).exists(): (r/_init).touch()
     if get_config().get('put_version_in_init', True): update_version(path)
+    if get_config().get('update_pyproject', True): update_proj(path.parent)
 
 # %% ../nbs/api/01_config.ipynb
-def write_cells(cells, hdr, file, offset=0, cell_number=True):
+def write_cells(cells, hdr, file, offset=0, cell_number=True, solo_nb=False):
     "Write `cells` to `file` along with header `hdr` starting at index `offset` (mainly for nbdev internal use)."
     for cell in cells:
         if cell.cell_type=='code' and cell.source.strip():
             idx = f" {cell.idx_+offset}" if cell_number else ""
-            file.write(f'\n\n{hdr}{idx}\n{cell.source}')
+            file.write(f'\n\n{hdr}{idx}\n{cell.source}') if not solo_nb else file.write(f'\n\n{cell.source}')
 
 # %% ../nbs/api/01_config.ipynb
 def _basic_export_nb(fname, name, dest=None):

nbdev-2.4.9/nbdev/diff.py

@@ -0,0 +1,92 @@
+"""Get ipynb diffs by cell"""
+
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/19_diff.ipynb.
+
+# %% auto 0
+__all__ = ['read_nb_from_git', 'nbs_pair', 'changed_cells', 'source_diff', 'cell_diffs']
+
+# %% ../nbs/api/19_diff.ipynb
+import json
+from fastcore.utils import *
+from fastcore.meta import delegates
+from difflib import unified_diff
+from fastgit import Git
+from execnb.nbio import *
+
+# %% ../nbs/api/19_diff.ipynb
+def read_nb_from_git(
+    g:Git, # The git object
+    path, # The path to the notebook (absolute or relative to git root)
+    ref=None # The git ref to read from (e.g. HEAD); None for working dir
+)->AttrDict: # The notebook
+    "Read notebook from git ref (e.g. HEAD) at path, or working dir if ref is None"
+    path = Path(path)
+    if path.is_absolute(): path = path.relative_to(g.top())
+    if ref is None: return read_nb(g.top()/path)
+    raw = g.show(f'{ref}:{path}', split=False)
+    return dict2nb(json.loads(raw))
+
+# %% ../nbs/api/19_diff.ipynb
+def _nb_srcdict(g:Git, nb_path, ref=None, f=noop):
+    "Dict of id->source"
+    nb = read_nb_from_git(g, nb_path, ref)
+    return {c['id']: f(c) for c in nb.cells}
+
+# %% ../nbs/api/19_diff.ipynb
+def nbs_pair(
+    nb_path, # Path to the notebook
+    ref_a='HEAD', # First git ref (None for working dir)
+    ref_b=None, # Second git ref (None for working dir)
+    f=noop  # Function to call on contents
+): # Tuple of two notebooks
+    "NBs at two refs; None means working dir. By default provides HEAD and working dir"
+    nb_path = Path(nb_path).resolve()
+    g = Git(nb_path.parent)
+    return _nb_srcdict(g, nb_path, ref_a, f), _nb_srcdict(g, nb_path, ref_b, f)
+
+# %% ../nbs/api/19_diff.ipynb
+def _cell_changes(
+    nb_path, # Path to the notebook
+    fn, # function to call to get dict values
+    ref_a='HEAD', # First git ref (None for working dir)
+    ref_b=None, # Second git ref (None for working dir)
+    adds=True, # Include cells in b but not in a
+    changes=True, # Include cells with different content
+    dels=False, # Include cells in a but not in b
+    metadata=False, # Consider cell metadata when comparing
+    outputs=False # Consider cell outputs when comparing
+): # Dict of results
+    "Apply fn(cell_id, old_content, new_content) to changed cells between two refs"
+    def cell_content(c):
+        res = c.get('source', '')
+        if metadata: res += '\n# metadata: ' + json.dumps(c.get('metadata', {}), sort_keys=True)
+        if outputs: res += '\n# outputs: ' + json.dumps(c.get('outputs', []), sort_keys=True)
+        return res
+    old,new = nbs_pair(nb_path, ref_a, ref_b, f=cell_content)
+    res = {}
+    if adds: res |= {cid: fn(cid, '', new[cid]) for cid in new if cid not in old}
+    if changes: res |= {cid: fn(cid, old[cid], new[cid]) for cid in new if cid in old and new[cid] != old[cid]}
+    if dels: res |= {cid: fn(cid, old[cid], '') for cid in old if cid not in new}
+    return res
+
+# %% ../nbs/api/19_diff.ipynb
+@delegates(_cell_changes)
+def changed_cells(nb_path, **kwargs):
+    "Return set of cell IDs for changed/added/deleted cells between two refs"
+    def f(cid,o,n): return cid
+    return set(_cell_changes(nb_path, f, **kwargs).keys())
+
+# %% ../nbs/api/19_diff.ipynb
+def source_diff(
+    old_source, # Original source string
+    new_source # New source string
+): # Unified diff string
+    "Return unified diff string for source change"
+    return '\n'.join(unified_diff(old_source.splitlines(), new_source.splitlines(), lineterm=''))
+
+# %% ../nbs/api/19_diff.ipynb
+@delegates(_cell_changes)
+def cell_diffs(nb_path, **kwargs):
+    "{cell_id:diff} for changed/added/deleted cells between two refs"
+    def f(cid,o,n): return source_diff(o,n)
+    return _cell_changes(nb_path, f, **kwargs)

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/doclinks.py

@@ -17,7 +17,7 @@ from fastcore.meta import delegates
 from fastcore.net import urlread
 
 import ast,builtins,contextlib
-import pkg_resources,importlib
+import importlib
 
 from astunparse import unparse
 from io import BytesIO
@@ -27,6 +27,8 @@ from urllib.parse import urljoin
 from functools import lru_cache
 from types import ModuleType
 
+from importlib.metadata import entry_points
+
 # %% ../nbs/api/05_doclinks.ipynb
 def _sym_nm(klas, sym): return f'{unparse(klas).strip()}.{sym.name}'
 
@@ -111,7 +113,8 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
                        if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}
     code_root = dest.parent.resolve()
     for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re=r"\.ipynb_checkpoints"):
-        res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
+        try: res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
+        except ValueError: pass
     idxfile.write_text("# Autogenerated by nbdev\n\nd = "+pformat(res, width=140, indent=2, compact=True)+'\n')
 
 # %% ../nbs/api/05_doclinks.ipynb
@@ -236,17 +239,24 @@ def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
     strip_libs = L(strip_libs)
     if incl_libs is not None: incl_libs = (L(incl_libs)+strip_libs).unique()
     entries = {}
-    for o in pkg_resources.iter_entry_points(group='nbdev'):
-        if incl_libs is not None and o.dist.key not in incl_libs: continue
-        try: entries[o.name] = _qual_syms(o.resolve())
+    try: eps = entry_points(group='nbdev')
+    # Python 3.9 fallback - entry_points() doesn't accept group parameter
+    except TypeError: eps = entry_points().get('nbdev', [])
+    
+    for o in eps:
+        if incl_libs is not None and o.dist.name not in incl_libs: continue
+        try: entries[o.name] = _qual_syms(o.load())
         except Exception: pass
     py_syms = merge(*L(o['syms'].values() for o in entries.values()).concat())
     for m in strip_libs:
         if m in entries:
             _d = entries[m]
-            stripped = {remove_prefix(k,f"{mod}."):v
-                        for mod,dets in _d['syms'].items() if mod not in skip_mods
-                        for k,v in dets.items()}
+            stripped = {}
+            for mod, dets in _d['syms'].items():
+                if mod not in skip_mods:
+                    for k,v in dets.items():
+                        k = remove_prefix(k,f"{mod}.")
+                        if k not in stripped: stripped[k] = v
             py_syms = merge(stripped, py_syms)
     return entries,py_syms
 

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/export.py

@@ -73,6 +73,7 @@ def nb_export(nbname:str,        # Filename of notebook
               name:str=None,     # Name of python script {name}.py to create.
               mod_maker=ModuleMaker,
               debug:bool=False,  # Debug mode
+              solo_nb:bool=False # Export single notebook outside of an nbdev project.
              ):
     "Create module(s) from notebook"
     if lib_path is None: lib_path = get_config().lib_path if is_nbdev() else '.'
@@ -84,9 +85,9 @@ def nb_export(nbname:str,        # Filename of notebook
             all_cells = exp.in_all[mod]
             nm = ifnone(name, getattr(exp, 'default_exp', None) if mod=='#' else mod)
             if not nm:
-                warn(f"Notebook '{nbname}' uses `#|export` without `#|default_exp` cell.\n"
+                warn(f"Notebook '{nbname}' uses `#| export` without `#| default_exp` cell.\n"
                      "Note nbdev2 no longer supports nbdev1 syntax. Run `nbdev_migrate` to upgrade.\n"
                      "See https://nbdev.fast.ai/getting_started.html for more information.")
                 return
-            mm = mod_maker(dest=lib_path, name=nm, nb_path=nbname, is_new=bool(name) or mod=='#')
+            mm = mod_maker(dest=lib_path, name=nm, nb_path=nbname, is_new=bool(name) or mod=='#', solo_nb=solo_nb)
             mm.make(cells, all_cells, lib_path=lib_path)

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/maker.py

@@ -63,7 +63,7 @@ def update_var(varname, func, fn=None, code=None):
 # %% ../nbs/api/02_maker.ipynb
 class ModuleMaker:
     "Helper class to create exported library from notebook source cells"
-    def __init__(self, dest, name, nb_path, is_new=True, parse=True):
+    def __init__(self, dest, name, nb_path, is_new=True, parse=True, solo_nb=False):
         dest,nb_path = Path(dest),Path(nb_path)
         store_attr()
         self.fname = dest/(name.replace('.','/') + ".py")
@@ -170,10 +170,10 @@ def _last_future(self:ModuleMaker, cells):
     except ValueError: return 0
 
 # %% ../nbs/api/02_maker.ipynb
-def _import2relative(cells, lib_name=None):
-    "Converts `cells` to use `import2relative` based on `lib_name`"
-    if lib_name is None: lib_name = get_config().lib_name
-    for cell in cells: cell.import2relative(lib_name)
+def _import2relative(cells, lib_path=None):
+    "Converts `cells` to use `import2relative` based on `lib_path`"
+    if lib_path is None: lib_path = get_config().lib_path
+    for cell in cells: cell.import2relative(lib_path)
 
 # %% ../nbs/api/02_maker.ipynb
 def _retr_mdoc(cells):
@@ -208,8 +208,8 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
         f.write(_retr_mdoc(cells))
         f.write(f"# AUTOGENERATED! DO NOT EDIT! File to edit: {self.dest2nb}.")
         if last_future > 0: write_cells(cells[:last_future], self.hdr, f)
-        if self.parse: f.write(f"\n\n# %% auto 0\n__all__ = {all_str}")
-        write_cells(cells[last_future:], self.hdr, f, cell_number=get_config().cell_number)
+        if self.parse and not self.solo_nb: f.write(f"\n\n# %% auto 0\n__all__ = {all_str}")
+        write_cells(cells[last_future:], self.hdr, f, cell_number=get_config().cell_number, solo_nb=self.solo_nb)
         f.write('\n')
 
 # %% ../nbs/api/02_maker.ipynb

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/process.py

@@ -35,7 +35,7 @@ def _quarto_re(lang=None): return re.compile(_dir_pre(lang) + r'\s*[\w|-]+\s*:')
 # %% ../nbs/api/03_process.ipynb
 def _directive(s, lang='python'):
     s = re.sub('^'+_dir_pre(lang), f"{langs[lang]}|", s)
-    if s.strip().endswith(':'): s = s.replace(':', '') # You can append colon at the end to be Quarto compliant.  Ex: #|hide:
+    if s.strip().endswith(':'): s = s.replace(':', '') # You can append colon at the end to be Quarto compliant.  Ex: #| hide:
     if ':' in s: s = s.replace(':', ': ')
     s = (s.strip()[2:]).strip().split()
     if not s: return None

{nbdev-2.3.34 → nbdev-2.4.9}/nbdev/quarto.py

@@ -21,7 +21,8 @@ import yaml
 
 # %% auto 0
 __all__ = ['BASE_QUARTO_URL', 'install_quarto', 'install', 'IndentDumper', 'nbdev_sidebar', 'refresh_quarto_yml',
-           'nbdev_proc_nbs', 'nbdev_readme', 'nbdev_docs', 'prepare', 'fs_watchdog', 'nbdev_preview']
+           'nbdev_proc_nbs', 'nbdev_readme', 'nbdev_contributing', 'nbdev_docs', 'prepare', 'fs_watchdog',
+           'nbdev_preview']
 
 # %% ../nbs/api/14_quarto.ipynb
 def _sprun(cmd):
@@ -69,7 +70,7 @@ def _sort(a):
     x,y = a
     if y.startswith('index.'): return x,'00'
     return a
-#|export
+#| export
 _def_file_re = r'\.(?:ipynb|qmd|html)$'
 
 @delegates(nbglob_cli)
@@ -214,7 +215,7 @@ def nbdev_proc_nbs(**kwargs):
     _pre_docs(**kwargs)[0]
 
 # %% ../nbs/api/14_quarto.ipynb
-def _readme_mtime_not_older(readme_path, readme_nb_path):
+def _doc_mtime_not_older(readme_path, readme_nb_path):
     if not readme_nb_path.exists():
         print(f"Could not find {readme_nb_path}")
         return True
@@ -259,7 +260,7 @@ def nbdev_readme(
     "Create README.md from readme_nb (index.ipynb by default)"
     cfg = get_config()
     path = Path(path) if path else cfg.nbs_path
-    if chk_time and _readme_mtime_not_older(cfg.config_path/'README.md', path/cfg.readme_nb): return
+    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)
@@ -267,6 +268,38 @@ def nbdev_readme(
         
     _save_cached_readme(cache, cfg)
 
+# %% ../nbs/api/14_quarto.ipynb
+def _save_cached_contributing(cache, cfg, contrib_nb):
+    "Move CONTRIBUTING.md (and any `_files` assets) from the Quarto build cache to the repo root."
+    tmp_doc_path = cache / cfg.doc_path.name
+    contrib_file = tmp_doc_path / 'CONTRIBUTING.md'
+    if contrib_file.exists():
+        final_path = cfg.config_path / 'CONTRIBUTING.md'
+        if final_path.exists(): final_path.unlink() # py37 doesn't have `missing_ok`
+        move(contrib_file, final_path)
+        assets_folder = tmp_doc_path / (Path(contrib_nb).stem + '_files') # Supporting files for CONTRIBUTING
+        if assets_folder.exists(): _copytree(assets_folder, cfg.config_path / assets_folder.name)
+
+# %% ../nbs/api/14_quarto.ipynb
+@call_parse
+def nbdev_contributing(
+    path:str=None,  # Path to notebooks
+    chk_time:bool=False  # Only build if out-of-date
+):
+    """Create CONTRIBUTING.md from contributing_nb (defaults to 'contributing.ipynb' if present). Skips if the file doesn't exist."""
+    cfg = get_config()
+    path = Path(path) if path else cfg.nbs_path
+    contrib_nb_name = cfg.get('contributing_nb', 'contributing.ipynb')
+    contrib_nb_path = path / contrib_nb_name
+    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)
+        _sprun(f'cd "{cache}" && quarto render "{cache/contrib_nb_name}" -o CONTRIBUTING.md -t gfm --no-execute')
+        
+    _save_cached_contributing(cache, cfg, contrib_nb_name)
+
 # %% ../nbs/api/14_quarto.ipynb
 @call_parse
 @delegates(_nbglob_docs)
@@ -277,6 +310,7 @@ def nbdev_docs(
     "Create Quarto docs and README.md"
     cache,cfg,path = _pre_docs(path, n_workers=n_workers, **kwargs)
     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)
@@ -291,6 +325,7 @@ def prepare():
     nbdev.clean.nbdev_clean.__wrapped__()
     refresh_quarto_yml()
     nbdev_readme.__wrapped__(chk_time=True)
+    nbdev_contributing.__wrapped__(chk_time=True)
 
 # %% ../nbs/api/14_quarto.ipynb
 @contextmanager