fix nbdev_update
#1058
fix nbdev_update
#1058
Conversation
- refactor `nbdev.doclinks._get_modidx` to use extracted `_iter_py_cells` function. - fix bug in `nbdev.maker.update_import` which meant that `nbdev_update` didn't convert relative imports without `None` module (e.g `from . import foo` -> `from pkg import foo`) - refactor `nbdev.process.extract_directives` to use extracted `_partition_cell` function. - fix `FileNotFoundError` in `nbdev_update` by passing the correct py module and corresponding notebook paths - fix `nbdev_update` introducing whitespace changes to notebooks
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
| def _nbpath2html(p): return p.with_name(re.sub(r'\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html') | ||
|
|
||
| # %% ../nbs/api/doclinks.ipynb 13 | ||
| def _get_modidx(py_path, code_root, nbs_path): |
There was a problem hiding this comment.
These changes should not change behaviour at all. They're to use the new _iter_py_cells function which is also used in sync.ipynb
| @@ -149,7 +149,7 @@ def update_import(source, tree, libname, f=relative_import): | |||
| nmod = f(imp.module, libname, imp.level) | |||
| lin = imp.lineno-1 | |||
| sec = src[lin][imp.col_offset:imp.end_col_offset] | |||
| newsec = re.sub(f"(from +){'.'*imp.level}{imp.module}", fr"\1{nmod}", sec) | |||
| newsec = re.sub(f"(from +){'.'*imp.level}{imp.module or ''}", fr"\1{nmod}", sec) | |||
There was a problem hiding this comment.
This is to fix:
fix bug in
nbdev.maker.update_importwhich meant thatnbdev_updatedidn't convert relative imports withoutNonemodule (e.gfrom . import foo->from pkg import foo)
| def extract_directives(cell, remove=True, lang='python'): | ||
| "Take leading comment directives from lines of code in `ss`, remove `#|`, and split" | ||
| if cell.source: |
There was a problem hiding this comment.
These should not change behaviour at all. It's to export _partition_cell which is used in sync.ipynb
| @@ -8,7 +8,9 @@ | |||
| from .config import * | |||
There was a problem hiding this comment.
I tested this by running nbdev_update in the nbdev repo and ensuring that it didn't change any of our notebooks
| @@ -43,35 +43,43 @@ def patch_name(o): | |||
| return _sym_nm(a,o) | |||
|
|
|||
| # %% ../nbs/api/doclinks.ipynb 9 | |||
| def _nbpath2html(p): return p.with_name(re.sub(r'\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html') | |||
| def _iter_py_cells(p): | |||
|
Looks great! |
Apologies for the huge PR! I'm happy to break it down into smaller PRs if you prefer
nbdev.maker.update_importwhich meant thatnbdev_updatedidn't convert relative imports withoutNonemodule (e.gfrom . import foo->from pkg import foo)FileNotFoundErrorinnbdev_updateby passing the correct py module and corresponding notebook pathsnbdev.doclinks._get_modidxto use extracted_iter_py_cellsfunction to support thisnbdev_updateintroducing whitespace changes to notebooksnbdev.process.extract_directivesto use extracted_partition_cellfunction to support this