nbdev 2.4.7__tar.gz → 2.4.8__tar.gz

{nbdev-2.4.7/nbdev.egg-info → nbdev-2.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 2.4.7
+Version: 2.4.8
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/AnswerDotAI/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -20,7 +20,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging
-Requires-Dist: fastcore>=1.8.14
+Requires-Dist: fastcore>=1.11.0
 Requires-Dist: execnb>=0.1.12
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=1.0.3

{nbdev-2.4.7 → nbdev-2.4.8}/nbdev/__init__.py

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

{nbdev-2.4.7 → nbdev-2.4.8}/nbdev/_modidx.py

@@ -49,6 +49,13 @@ d = { 'settings': { 'branch': 'main',
                               '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'),

{nbdev-2.4.7 → nbdev-2.4.8}/nbdev/cli.py

@@ -188,7 +188,7 @@ def watch_export(nbs:str=None, # Nb directory to watch for changes
     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 (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}"')

nbdev-2.4.8/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.4.7 → nbdev-2.4.8}/nbdev/release.py

@@ -63,7 +63,7 @@ class Release:
 
     def _issues(self, label):
         return self.gh.issues.list_for_repo(state='closed', sort='created', filter='all', since=self.commit_date, labels=label)
-    def _issue_groups(self): return parallel(self._issues, self.groups.keys(), progress=False)
+    def _issue_groups(self): return parallel(self._issues, self.groups.keys(), progress=False, threadpool=True)
 
 # %% ../nbs/api/18_release.ipynb
 @patch

{nbdev-2.4.7 → nbdev-2.4.8/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 2.4.7
+Version: 2.4.8
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/AnswerDotAI/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -20,7 +20,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging
-Requires-Dist: fastcore>=1.8.14
+Requires-Dist: fastcore>=1.11.0
 Requires-Dist: execnb>=0.1.12
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=1.0.3

{nbdev-2.4.7 → nbdev-2.4.8}/nbdev.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ nbdev/_modidx.py
 nbdev/clean.py
 nbdev/cli.py
 nbdev/config.py
+nbdev/diff.py
 nbdev/doclinks.py
 nbdev/export.py
 nbdev/extract_attachments.py

{nbdev-2.4.7 → nbdev-2.4.8}/nbdev.egg-info/requires.txt

@@ -1,5 +1,5 @@
 packaging
-fastcore>=1.8.14
+fastcore>=1.11.0
 execnb>=0.1.12
 astunparse
 ghapi>=1.0.3

{nbdev-2.4.7 → nbdev-2.4.8}/settings.ini

@@ -9,13 +9,13 @@ author = Jeremy Howard and Hamel Husain
 author_email = j@fast.ai
 branch = main
 min_python = 3.9
-version = 2.4.7
+version = 2.4.8
 audience = Developers
 language = English
 custom_sidebar = True
 license = apache2
 status = 5
-requirements = fastcore>=1.8.14 execnb>=0.1.12 astunparse ghapi>=1.0.3 watchdog asttokens setuptools build
+requirements = fastcore>=1.11.0 execnb>=0.1.12 astunparse ghapi>=1.0.3 watchdog asttokens setuptools build
 pip_requirements = PyYAML
 conda_requirements = pyyaml
 conda_user = fastai