nbdev 3.3.26__tar.gz → 3.3.28__tar.gz

{nbdev-3.3.26/nbdev.egg-info → nbdev-3.3.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.26
+Version: 3.3.28
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License-Expression: Apache-2.0
@@ -40,6 +40,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: plum-dispatch; extra == "dev"
 Requires-Dist: nbclient; extra == "dev"
 Requires-Dist: ipykernel; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 # Getting Started

{nbdev-3.3.26 → nbdev-3.3.28}/nbdev/__init__.py

@@ -6,7 +6,7 @@ Modules:
 - `nbdev.moddocs`: # Module docs: creating them from existing notebooks
 - `nbdev.skill`: Write, read and review nbdev notebooks as source, documentation, examples and tests. You MUST read this before any work on a project with notebooks."""
 
-__version__ = "3.3.26"
+__version__ = "3.3.28"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.26 → nbdev-3.3.28}/nbdev/_modidx.py

@@ -81,18 +81,12 @@ d = { 'settings': { 'branch': 'main',
                               '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._diff_order': ('api/diff.html#_diff_order', 'nbdev/diff.py'),
-                            'nbdev.diff._dline': ('api/diff.html#_dline', 'nbdev/diff.py'),
                             'nbdev.diff._dtag': ('api/diff.html#_dtag', 'nbdev/diff.py'),
                             'nbdev.diff._file_cells': ('api/diff.html#_file_cells', 'nbdev/diff.py'),
                             'nbdev.diff._nb_srcdict': ('api/diff.html#_nb_srcdict', 'nbdev/diff.py'),
                             'nbdev.diff._out_lines': ('api/diff.html#_out_lines', 'nbdev/diff.py'),
-                            'nbdev.diff._refine': ('api/diff.html#_refine', 'nbdev/diff.py'),
                             'nbdev.diff._src': ('api/diff.html#_src', 'nbdev/diff.py'),
                             'nbdev.diff._srcdict': ('api/diff.html#_srcdict', 'nbdev/diff.py'),
-                            'nbdev.diff._tokens': ('api/diff.html#_tokens', 'nbdev/diff.py'),
-                            'nbdev.diff._trunc': ('api/diff.html#_trunc', 'nbdev/diff.py'),
-                            'nbdev.diff._wline': ('api/diff.html#_wline', 'nbdev/diff.py'),
-                            'nbdev.diff._word_diff': ('api/diff.html#_word_diff', '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.nb_diff': ('api/diff.html#nb_diff', 'nbdev/diff.py'),
@@ -100,8 +94,7 @@ d = { 'settings': { 'branch': 'main',
                             'nbdev.diff.nbdev_diff_driver': ('api/diff.html#nbdev_diff_driver', '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.render_diff': ('api/diff.html#render_diff', 'nbdev/diff.py'),
-                            'nbdev.diff.source_diff': ('api/diff.html#source_diff', 'nbdev/diff.py')},
+                            'nbdev.diff.render_diff': ('api/diff.html#render_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-3.3.26 → nbdev-3.3.28}/nbdev/diff.py

@@ -5,21 +5,21 @@ Docs: https://nbdev.fast.ai/api/diff.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/19_diff.ipynb.
 
 # %% auto #0
-__all__ = ['MAXLEN', 'OUT_MAXLEN', 'MIN_RATIO', 'read_nb_from_git', 'nbs_pair', 'changed_cells', 'source_diff', 'cell_diffs',
-           'render_diff', 'nb_diff', 'nbdev_diff_driver', 'nbdev_diff']
+__all__ = ['OUT_MAXLEN', 'read_nb_from_git', 'nbs_pair', 'changed_cells', 'cell_diffs', 'render_diff', 'nb_diff',
+           'nbdev_diff_driver', 'nbdev_diff']
 
 # %% ../nbs/api/19_diff.ipynb #10c8ad0b
 import json
 from fastcore.utils import *
 from fastcore.meta import delegates
 from fastcore.script import *
-from difflib import unified_diff, SequenceMatcher
 from subprocess import CalledProcessError
 from typing import Annotated
 from fastgit import Git
 from fastcore.nbio import *
 from fastcore.nbio import _directive
 from .doclinks import nbglob
+from .diff_core import *
 
 # %% ../nbs/api/19_diff.ipynb #a8981115
 def read_nb_from_git(
@@ -99,94 +99,16 @@ def changed_cells(nb_path, **kwargs):
     def f(cid,o,n): return cid
     return set(_cell_changes(nb_path, f, **kwargs).keys())
 
-# %% ../nbs/api/19_diff.ipynb #079eedb0
-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 #38216afa
 @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)
+    def f(cid,o,n): return source_diff(o,n,final_newline=False)
     return _cell_changes(nb_path, f, **kwargs)
 
 # %% ../nbs/api/19_diff.ipynb #d670e58e
-MAXLEN = 180 # Most characters shown per displayed line
 OUT_MAXLEN = 512 # Most characters shown of a cell's stored output
-MIN_RATIO = 0.5 # Least similar (by shared words) a changed line pair can be and still merge into one word-diff line
-_dcolors = {'## …':'\x1b[34m', '# ':'\x1b[1;7m', '#':'\x1b[1m', '-':'\x1b[31m', '+':'\x1b[32m', '@':'\x1b[36m'}
-
-def _trunc(s, maxlen):
-    "`s` cut to `maxlen`, ending `…[n]` with `n` the number of characters missing"
-    if not maxlen or len(s)<=maxlen: return s
-    return truncstr(s, maxlen, suf=lambda n: f'…[{humanize(n)}]')
-
-def _dline(l, maxlen=MAXLEN, color=False):
-    "Truncate `l` with `_trunc`, optionally colored by its leading diff marker; word-diff spans render via `_wline`"
-    if not isinstance(l, str): return _wline(l, maxlen, color)
-    l = _trunc(l, maxlen)
-    c = first(v for k,v in _dcolors.items() if l.startswith(k)) if color else None
-    return f'{c}{l}\x1b[0m' if c else l
 
-# %% ../nbs/api/19_diff.ipynb #7a1d7b28
-_wcolors = {'-':'\x1b[31;9m', '+':'\x1b[32m'}
-_wmarks = {'-':('[-','-]'), '+':('{+','+}')}
-
-def _tokens(s): return re.findall(r'\w+|\s+|[^\w\s]', s)
-
-def _word_diff(a, b, maxlen=MAXLEN):
-    "`(kind, text)` spans merging lines `a` and `b` (' ' shared, '-' only in `a`, '+' only in `b`); None when too different, or longer than `maxlen`"
-    if maxlen and max(len(a),len(b))>maxlen: return None
-    if SequenceMatcher(None, re.findall(r'\w+', a), re.findall(r'\w+', b), autojunk=False).ratio()<MIN_RATIO: return None
-    ta,tb = _tokens(a),_tokens(b)
-    res = []
-    for tag,i1,i2,j1,j2 in SequenceMatcher(None, ta, tb, autojunk=False).get_opcodes():
-        if tag=='equal': res.append((' ', ''.join(ta[i1:i2])))
-        else:
-            if i2>i1: res.append(('-', ''.join(ta[i1:i2])))
-            if j2>j1: res.append(('+', ''.join(tb[j1:j2])))
-    return res
-
-def _wline(spans, maxlen=MAXLEN, color=False):
-    "One `!` line from word-diff `spans`: deletions red and struck out, additions green, or `[-…-]`/`{+…+}` markers without `color`"
-    if not color: return _dline('!'+''.join(t if k==' ' else _wmarks[k][0]+t+_wmarks[k][1] for k,t in spans), maxlen)
-    full = '!'+''.join(t for _,t in spans)
-    cut = _trunc(full, maxlen)
-    suf = cut[cut.rfind('…['):] if cut!=full else ''
-    res,room = '!',len(cut)-len(suf)-1
-    for k,t in spans:
-        t = t[:room]
-        room -= len(t)
-        res += t if k==' ' else f'{_wcolors[k]}{t}\x1b[0m'
-        if not room: break
-    return res+suf
-
-# %% ../nbs/api/19_diff.ipynb #2bf82340
-def _refine(lines, maxlen=MAXLEN):
-    "Diff `lines` with each positionally paired `-`/`+` line merged into word-diff spans where `_word_diff` allows"
-    res,i = [],0
-    while i<len(lines):
-        if not lines[i].startswith('-'):
-            res.append(lines[i])
-            i += 1
-            continue
-        j = i
-        while j<len(lines) and lines[j].startswith('-'): j += 1
-        k = j
-        while k<len(lines) and lines[k].startswith('+'): k += 1
-        olds,news = lines[i:j],lines[j:k]
-        bo,bn = [],[]
-        for o,n in zip(olds,news):
-            w = _word_diff(o[1:], n[1:], maxlen)
-            if w: res,bo,bn = res+bo+bn+[w],[],[]
-            else: bo,bn = bo+[o],bn+[n]
-        res += bo+olds[len(news):]+bn+news[len(olds):]
-        i = k
-    return res
 
 # %% ../nbs/api/19_diff.ipynb #342fc231
 def _diff_order(old, new):
@@ -201,7 +123,7 @@ def _diff_order(old, new):
 # %% ../nbs/api/19_diff.ipynb #eb3fc128
 def _out_lines(c):
     "Stored outputs of cell `c` rendered as text, capped at `OUT_MAXLEN` chars, each line prefixed `| `"
-    r = _trunc(render_text(c.get('outputs', [])), OUT_MAXLEN)
+    r = truncate(render_text(c.get('outputs', [])), OUT_MAXLEN)
     return [f'| {l}' for l in r.splitlines()]
 
 def render_diff(
@@ -210,6 +132,7 @@ def render_diff(
     maxlen:int=MAXLEN, # Truncate diff lines to this width (falsy: no limit)
     color:bool=False, # Add ANSI colors?
     context:int=1, # Unchanged cells to show either side of each change
+    line_context:int=3, # Unchanged source lines to show either side of each change
     show_out:bool=True # Show the stored outputs of changed and added cells?
 ): # One section per shown cell, in notebook order
     "Render cell-level changes between two notebooks as truncated unified diffs, with context cells and outputs"
@@ -220,16 +143,19 @@ def render_diff(
     res,prev = [],-1
     for i,cid in enumerate(order):
         if i not in show: continue
-        if 0<=prev<i-1: res.append(_dline(f'## … {i-prev-1} cells', maxlen, color))
+        if 0<=prev<i-1: res.append(render_line(f'## … {i-prev-1} cells', maxlen, color))
         prev = i
         c = new.get(cid) or old[cid]
-        if not _changed(cid): lines = [f'## {cid}{_dtag(c)}:'] + [' '+l for l in _src(c).splitlines()]
+        if not _changed(cid):
+            lines = [render_line(l, maxlen, color) for l in [f'## {cid}{_dtag(c)}:'] + [' '+l for l in _src(c).splitlines()]]
         else:
             o,n = (_src(old[cid]) if cid in old else ''), (_src(new[cid]) if cid in new else '')
             kind = 'modified' if cid in old and cid in new else 'added' if cid in new else 'deleted'
-            lines = [f'## {kind} {cid}{_dtag(c)}:'] + _refine(source_diff(o,n).splitlines()[2:], maxlen)
-            if show_out and cid in new: lines += _out_lines(new[cid])
-        res.append('\n'.join(_dline(l, maxlen, color) for l in lines))
+            lines = [render_line(f'## {kind} {cid}{_dtag(c)}:', maxlen, color)]
+            source = render_source_diff(o, n, maxlen=maxlen, color=color, context=line_context, final_newline=False)
+            if source: lines.append(source)
+            if show_out and cid in new: lines += [render_line(l, maxlen, color) for l in _out_lines(new[cid])]
+        res.append('\n'.join(lines))
     return '\n\n'.join(res)
 
 # %% ../nbs/api/19_diff.ipynb #7f90d675
@@ -240,11 +166,12 @@ def nb_diff(
     maxlen:int=MAXLEN, # Truncate diff lines to this width (falsy: no limit)
     color:bool=False, # Add ANSI colors?
     context:int=1, # Unchanged cells to show either side of each change
+    line_context:int=3, # Unchanged source lines to show either side of each change
     show_out:bool=True # Show the stored outputs of changed and added cells?
 ): # Rendered diff of changed cells
     "Rendered cell diff for `nb_path` between two refs"
     a,b = nbs_pair(nb_path, ref_a, ref_b)
-    return render_diff(a, b, maxlen=maxlen, color=color, context=context, show_out=show_out)
+    return render_diff(a, b, maxlen=maxlen, color=color, context=context, line_context=line_context, show_out=show_out)
 
 # %% ../nbs/api/19_diff.ipynb #ab9f0b26
 def _file_cells(path):
@@ -257,7 +184,7 @@ _pos = Annotated[str, {'opt':False, 'nargs':'?'}]  # optional positional CLI arg
 
 @call_parse
 def nbdev_diff_driver(
-    path:str, # Repo path of the notebook being diffed
+    path:str, # Repo path of the file being diffed
     old_file:_pos=None, # Pre-change file (git temp file, or /dev/null)
     old_hex:_pos=None, # Pre-change blob hash
     old_mode:_pos=None, # Pre-change file mode
@@ -267,16 +194,30 @@ def nbdev_diff_driver(
     rename_to:_pos=None, # New repo path, when git detected a rename
     similarity:_pos=None, # Similarity score, when git detected a rename
     maxlen:int=MAXLEN, # Truncate diff lines to this width (0 for no limit)
-    context:int=1, # Unchanged cells to show either side of each change
+    context:int=1, # Unchanged notebook cells to show either side of each change
+    line_context:int=3, # Unchanged source lines to show either side of each change
     show_out:bool=True # Show the stored outputs of changed and added cells?
 ):
-    "Git external diff driver for notebooks; installed by `nbdev-install-hooks`"
+    "Git external diff driver for notebooks and plain text files"
     if not new_file: return print(f'unmerged: {path}')
     color = sys.stdout.isatty() or os.environ.get('GIT_PAGER_IN_USE')=='true'
-    res = render_diff(_file_cells(old_file), _file_cells(new_file), maxlen=maxlen, color=color, context=context, show_out=show_out)
-    if not res: return
-    print(_dline(f'# {path}', 0, color))
-    print(res, end='\n\n')
+    if Path(path).suffix=='.ipynb':
+        res = render_diff(_file_cells(old_file), _file_cells(new_file), maxlen=maxlen, color=color,
+                          context=context, line_context=line_context, show_out=show_out)
+    else:
+        old,new = Path(old_file).read_bytes(),Path(new_file).read_bytes()
+        res = 'Binary files differ' if old!=new else ''
+        if b'\0' not in old and b'\0' not in new:
+            try: res = render_source_diff(old.decode('utf-8'), new.decode('utf-8'), maxlen=maxlen, color=color, context=line_context)
+            except UnicodeDecodeError: pass
+    meta = []
+    if rename_to: meta.append(f'rename to {rename_to}')
+    if old_mode and new_mode and old_mode!=new_mode: meta.append(f'mode {old_mode} -> {new_mode}')
+    if not res and not meta: return
+    print(render_line(f'# {path}', 0, color))
+    for line in meta: print(render_line('# '+line, 0, color))
+    if res: print(res)
+    print()
 
 # %% ../nbs/api/19_diff.ipynb #2604c719
 @call_parse
@@ -287,10 +228,11 @@ def nbdev_diff(
     maxlen:int=MAXLEN, # Truncate diff lines to this width (0 for no limit)
     color:bool_arg=None, # Add ANSI colors? (default: only if stdout is a tty)
     context:int=1, # Unchanged cells to show either side of each change
+    line_context:int=3, # Unchanged source lines to show either side of each change
     show_out:bool=True # Show the stored outputs of changed and added cells?
 ):
     "Cell-level diffs for changed notebooks between two git refs"
     if color is None: color = sys.stdout.isatty()
     for p in sorted(nbglob(path)):
-        res = nb_diff(p, ref_a, ref_b, maxlen=maxlen, color=color, context=context, show_out=show_out)
-        if res: print(_dline(f'# {p}', 0, color), res, sep='\n', end='\n\n')
+        res = nb_diff(p, ref_a, ref_b, maxlen=maxlen, color=color, context=context, line_context=line_context, show_out=show_out)
+        if res: print(render_line(f'# {p}', 0, color), res, sep='\n', end='\n\n')

nbdev-3.3.28/nbdev/diff_core.py

@@ -0,0 +1,138 @@
+"Word-level terminal diffs of plain text, shared by file and notebook rendering."
+
+from difflib import unified_diff, SequenceMatcher
+from fastcore.utils import *
+
+__all__ = ['MAXLEN', 'MIN_RATIO', 'truncate', 'render_line', 'source_diff', 'render_source_diff']
+
+MAXLEN = 180 # Most visible characters per displayed line; 0 means unlimited
+MIN_RATIO = 0.5 # Minimum shared-word similarity for merging a changed line pair
+_dcolors = {'## …':'\x1b[34m', '# ':'\x1b[1;7m', '#':'\x1b[1m', '-':'\x1b[31m', '+':'\x1b[32m', '@':'\x1b[36m'}
+_wcolors = {'-':'\x1b[31;9m', '+':'\x1b[32m'}
+_wmarks = {'-':('[-','-]'), '+':('{+','+}')}
+
+
+def truncate(s, maxlen):
+    "Cut `s` to `maxlen`, marking the number of omitted characters; 0 means unlimited."
+    if not maxlen or len(s)<=maxlen: return s
+    return truncstr(s, maxlen, suf=lambda n: f'…[{humanize(n)}]')[:maxlen]
+
+
+def render_line(
+    line, # A display line, including its diff or heading marker
+    maxlen=MAXLEN, # Maximum visible length; 0 means unlimited
+    color=False # Add ANSI colors?
+):
+    "Truncate and optionally color a line by its leading display marker."
+    line = truncate(line, maxlen)
+    c = next((v for k,v in _dcolors.items() if line.startswith(k)), '') if color else ''
+    return f'{c}{line}\x1b[0m' if c else line
+
+
+def _source_lines(old, new, context, final_newline):
+    def lines(s): return s.splitlines(keepends=True) if final_newline else [l+'\n' for l in s.splitlines()]
+    return list(unified_diff(lines(old), lines(new), n=context))
+
+
+def source_diff(
+    old_source, # Original source string
+    new_source, # New source string
+    context=3, # Unchanged lines shown either side of a change
+    final_newline=True # Distinguish a missing final newline (unnecessary for notebook cells)?
+):
+    "Unified source diff, including missing-final-newline markers."
+    lines = _source_lines(old_source, new_source, context, final_newline)
+    return '\n'.join(l.removesuffix('\n') + ('' if l.endswith('\n') else '\n\') for l in lines)
+
+
+def _word_diff(a, b):
+    if a==b: return None
+    if SequenceMatcher(None, re.findall(r'\w+', a), re.findall(r'\w+', b), autojunk=False).ratio()<MIN_RATIO: return None
+    ta,tb = (re.findall(r'\w+|\s+|[^\w\s]', s) for s in (a,b))
+    res = []
+    for tag,i1,i2,j1,j2 in SequenceMatcher(None, ta, tb, autojunk=False).get_opcodes():
+        if tag=='equal': res.append((' ', ''.join(ta[i1:i2])))
+        else:
+            if i2>i1: res.append(('-', ''.join(ta[i1:i2])))
+            if j2>j1: res.append(('+', ''.join(tb[j1:j2])))
+    return res
+
+
+def _refine(lines):
+    res,i = [],0
+    while i<len(lines):
+        if not lines[i].startswith('-'):
+            res.append(lines[i])
+            i += 1
+            continue
+        j = i
+        while j<len(lines) and lines[j].startswith('-'): j += 1
+        k = j
+        while k<len(lines) and lines[k].startswith('+'): k += 1
+        olds,news = lines[i:j],lines[j:k]
+        bo,bn = [],[]
+        for o,n in zip(olds,news):
+            w = _word_diff(o[1:], n[1:])
+            if w: res,bo,bn = res+bo+bn+[w],[],[]
+            else: bo,bn = bo+[o],bn+[n]
+        res += bo+olds[len(news):]+bn+news[len(olds):]
+        i = k
+    return res
+
+
+def _slice_spans(spans, start, end):
+    res,pos = [],0
+    for k,t in spans:
+        a,b = max(0,start-pos), min(len(t),end-pos)
+        if a<b: res.append((k,t[a:b]))
+        pos += len(t)
+        if pos>=end: break
+    return res
+
+
+def _span_width(spans, color): return sum(len(t)+(4 if k!=' ' and not color else 0) for k,t in spans)
+
+
+def _render_spans(spans, maxlen, color):
+    total = sum(len(t) for _,t in spans)
+    start,end = 0,total
+    if maxlen and _span_width(spans, color)+1>maxlen:
+        first = int(spans[0][0]==' ')
+        prefix = len(spans[0][1]) if first else 0
+        last = first
+        while last<len(spans) and spans[last][0]!=' ': last += 1
+        room = maxlen-1-_span_width(spans[first:last], color)-2*len(f'…[{total}]')
+        start = max(0,prefix-min(20,maxlen//4,max(0,room)))
+        end = min(total,start+maxlen-1)
+        while True:
+            shown = _slice_spans(spans, start, end)
+            head,tail = (f'…[{start}]' if start else ''), (f'…[{total-end}]' if end<total else '')
+            excess = 1+len(head)+_span_width(shown, color)+len(tail)-maxlen
+            if excess<=0: break
+            if end==start: return truncate('!'+head+tail, maxlen)
+            end = max(start,end-excess)
+    else: shown,head,tail = spans,'',''
+    def fmt(k,t):
+        if k==' ': return t
+        if color: return f'{_wcolors[k]}{t}\x1b[0m'
+        return _wmarks[k][0]+t+_wmarks[k][1]
+    return '!'+head+''.join(fmt(k,t) for k,t in shown)+tail
+
+
+def render_source_diff(
+    old_source, # Original source string
+    new_source, # New source string
+    maxlen=MAXLEN, # Maximum visible length; 0 means unlimited
+    color=False, # Add ANSI colors instead of [-removed-]/{+added+} markers?
+    context=3, # Unchanged lines shown either side of a change
+    final_newline=True # Distinguish a missing final newline (unnecessary for notebook cells)?
+):
+    "Render source changes, cropping long word-diff lines around the first change."
+    lines = _source_lines(old_source, new_source, context, final_newline)
+    if not lines: return ''
+    body = [l.removesuffix('\n') for l in lines[2:]]
+    res = [render_line(l, maxlen, color) if isinstance(l,str) else _render_spans(l, maxlen, color) for l in _refine(body)]
+    if final_newline:
+        for name,text in (('old',old_source), ('new',new_source)):
+            if text and not text.endswith('\n'): res.append(render_line(fr'\ No newline at end of {name} file', maxlen, color))
+    return '\n'.join(res)

{nbdev-3.3.26 → nbdev-3.3.28}/nbdev/quarto_render.py

@@ -6,8 +6,8 @@ from fastcore.parallel import parallel
 from fastcore.utils import *
 
 
-def _quarto(path, *args):
-    res = subprocess.run(['quarto', *map(str, args)], cwd=path, capture_output=True, text=True)
+def _quarto(path, *args, env=None):
+    res = subprocess.run(['quarto', *map(str, args)], cwd=path, capture_output=True, text=True, env=env)
     if res.returncode: raise RuntimeError(res.stderr or res.stdout or f'Quarto exited with status {res.returncode}')
     return res.stdout
 
@@ -25,7 +25,8 @@ def quarto_stale(path, output_dir):
 
 def _render_batch(job):
     path, inputs, output = job
-    _quarto(path, 'render', *inputs, '--no-cache', '--no-clean', '--output-dir', output)
+    env = {**os.environ, 'XDG_CACHE_HOME': str(path/'.cache')} if sys.platform == 'linux' else None
+    _quarto(path, 'render', *inputs, '--no-cache', '--no-clean', '--output-dir', output, env=env)
     return output
 
 

{nbdev-3.3.26 → nbdev-3.3.28/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.26
+Version: 3.3.28
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License-Expression: Apache-2.0
@@ -40,6 +40,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: plum-dispatch; extra == "dev"
 Requires-Dist: nbclient; extra == "dev"
 Requires-Dist: ipykernel; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 # Getting Started

{nbdev-3.3.26 → nbdev-3.3.28}/nbdev.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ nbdev/clean.py
 nbdev/cli.py
 nbdev/config.py
 nbdev/diff.py
+nbdev/diff_core.py
 nbdev/doclinks.py
 nbdev/export.py
 nbdev/extract_attachments.py
@@ -37,4 +38,5 @@ nbdev.egg-info/dependency_links.txt
 nbdev.egg-info/entry_points.txt
 nbdev.egg-info/requires.txt
 nbdev.egg-info/top_level.txt
+tests/test_diff.py
 tests/test_quarto_render.py

{nbdev-3.3.26 → nbdev-3.3.28}/nbdev.egg-info/requires.txt

@@ -26,3 +26,4 @@ sphinx
 plum-dispatch
 nbclient
 ipykernel
+pytest

{nbdev-3.3.26 → nbdev-3.3.28}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [ "fastcore>=2.2.28", "execnb>=0.3.3", "astunparse", "ghapi>=2.0.
     "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]
-dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", "nbclient", "ipykernel", ]
+dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", "nbclient", "ipykernel", "pytest", ]
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/nbdev"

nbdev-3.3.28/tests/test_diff.py

@@ -0,0 +1,78 @@
+import os, re, shlex, subprocess, sys
+from fastcore.nbio import new_nb, write_nb
+from nbdev.diff_core import render_source_diff, source_diff
+
+
+def test_source_changes():
+    old = 'x=1\ny=2\nz=3\nk=4\n'
+    new = 'x = 100\ny=2\nw=5\nq=6\n'
+    result = render_source_diff(old, new)
+    assert '!x{+ +}=[-1-]{+ 100+}' in result
+    assert '-z=3\n-k=4\n+w=5\n+q=6' in result
+    assert '+hello' in render_source_diff('', 'hello\n')
+    assert '-hello' in render_source_diff('hello\n', '')
+    assert not render_source_diff(old, old)
+
+
+def test_long_line_changes():
+    prefix = ' '.join(f'word{i}' for i in range(80))+' '
+    tail = ' '.join(f'tail{i}' for i in range(80))
+    old, new = prefix+'green '+tail+' old\n', prefix+'blue '+tail+' new\n'
+    for color in (False, True):
+        result = render_source_diff(old, new, maxlen=80, color=color)
+        visible = re.sub(r'\x1b\[[\d;]*m', '', result)
+        assert all(len(line)<=80 for line in visible.splitlines())
+        assert 'green' in result and 'blue' in result and 'word0 ' not in result
+        assert '…[' in result and ' new' not in result
+        if color: assert '\x1b[31;9mgreen\x1b[0m' in result and '\x1b[32mblue\x1b[0m' in result
+        else: assert '[-green-]{+blue+}' in result
+    full = render_source_diff(old, new, maxlen=0)
+    assert 'word0 ' in full and '[-old-]{+new+}' in full
+    before,after = 'a'*22,'b'*22
+    result = render_source_diff(prefix+before+' '+tail, prefix+after+' '+tail, maxlen=80)
+    assert f'[-{before}-]{{+{after}+}}' in result
+
+
+def test_final_newline():
+    assert r'' in source_diff('hello\n', 'hello')
+    assert 'new file' in render_source_diff('hello\n', 'hello')
+    assert 'old file' in render_source_diff('hello', 'hello\n')
+    assert not render_source_diff('hello\n', 'hello', final_newline=False)
+
+
+def test_git_driver(tmp_path):
+    env = {**os.environ, 'GIT_CONFIG_GLOBAL': os.devnull, 'GIT_CONFIG_NOSYSTEM': '1'}
+    def git(*args):
+        return subprocess.run(['git', *args], cwd=tmp_path, env=env, capture_output=True, text=True, check=True).stdout
+    driver = tmp_path/'driver.py'
+    driver.write_text('from nbdev.diff import nbdev_diff_driver\nnbdev_diff_driver()')
+    git('init', '-q')
+    git('config', 'user.name', 'nbdev')
+    git('config', 'user.email', 'nbdev@fast.ai')
+    git('config', 'diff.nbdev.command', shlex.join([sys.executable, str(driver), '--maxlen', '80']))
+    (tmp_path/'.gitattributes').write_text('*.md diff=nbdev\n*.py diff=nbdev\n*.ipynb diff=nbdev\n')
+    note, source = tmp_path/'note.md', tmp_path/'source.py'
+    prefix = 'A notebook has words. '*20
+    note.write_text(prefix+'This is a green notebook.\n')
+    source.write_text('#| export\nx=1\n')
+    nb_path = tmp_path/'demo.ipynb'
+    nb = new_nb(['#| export\nx=1'])
+    write_nb(nb, nb_path)
+    git('add', '.')
+    git('commit', '-qm', 'initial')
+    note.write_text(prefix+'This is a blue notebook.\n')
+    source.write_text('#| exports\nx=100\n')
+    nb.cells[0].source = '#| export\nx=100'
+    write_nb(nb, nb_path)
+    result = git('diff')
+    assert '[-green-]{+blue+}' in result
+    assert all(len(line)<=80 for line in result.splitlines() if line.startswith('!'))
+    assert '-#| export\n+#| exports' in result and '## modified' in result and '[export]' in result
+    assert '[-1-]{+100+}' in result
+    git('add', '.')
+    git('commit', '-qm', 'edited')
+    git('mv', 'note.md', 'renamed.md')
+    git('update-index', '--chmod=+x', 'source.py')
+    result = git('diff', '--cached', '--find-renames')
+    assert 'note.md' in result and 'renamed.md' in result
+    assert '100644' in result and '100755' in result

{nbdev-3.3.26 → nbdev-3.3.28}/tests/test_quarto_render.py

@@ -1,4 +1,4 @@
-import json, shutil, subprocess, pytest
+import json, shutil, subprocess, sys, pytest
 from xml.etree import ElementTree as ET
 from fastcore.test import test_eq as teq
 from nbdev.quarto_render import render_quarto, quarto_stale
@@ -40,7 +40,9 @@ Documentation = "https://example.com/project/"
 
 
 @pytest.mark.skipif(not shutil.which('quarto'), reason='requires Quarto')
-def test_website(tmp_path):
+def test_website(tmp_path, monkeypatch):
+    cache = tmp_path/'cache'
+    monkeypatch.setenv('XDG_CACHE_HOME', str(cache))
     root = tmp_path/'source'
     root.mkdir()
     (root/'_quarto.yml').write_text(r'''project:
@@ -68,9 +70,10 @@ Page {name}. [Alpha](alpha.qmd#detail). [Download](data.txt).
     (root/'other.qmd').write_text('---\noutput-file: renamed.html\n---\n# Other')
     serial, parallel = tmp_path/'serial', root/'_site'
     assert quarto_stale(root, parallel)
-    render_quarto(root, serial, n_workers=1)
     render_quarto(root, parallel, n_workers=2)
+    if sys.platform == 'linux': assert not (cache/'quarto/sass').exists()
     assert not quarto_stale(root, parallel)
+    render_quarto(root, serial, n_workers=1)
     search = lambda d: {e['href']: e['text'] for e in json.loads((d/'search.json').read_text())}
     urls = lambda d: {e.text for e in ET.parse(d/'sitemap.xml').findall('.//{*}loc')}
     teq(search(serial), search(parallel))