nbdev 2.3.12__tar.gz → 2.3.14__tar.gz

{nbdev-2.3.12/nbdev.egg-info → nbdev-2.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbdev
-Version: 2.3.12
+Version: 2.3.14
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/fastai/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -15,28 +15,35 @@ 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.11
 Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: packaging
+Requires-Dist: ipywidgets<=8.0.4
+Requires-Dist: fastcore>=1.5.27
+Requires-Dist: execnb>=0.1.4
+Requires-Dist: astunparse
+Requires-Dist: ghapi>=1.0.3
+Requires-Dist: watchdog
+Requires-Dist: asttokens
+Requires-Dist: PyYAML
+Provides-Extra: dev
+Requires-Dist: nbdev-numpy; extra == "dev"
+Requires-Dist: nbdev-stdlib; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: svg.py; extra == "dev"
+Requires-Dist: jupyter; extra == "dev"
 
-Getting Started
-================
+# Getting Started
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 
 ![CI](https://github.com/fastai/nbdev/actions/workflows/test.yaml/badge.svg)
 
-*NB: This is nbdev v2, a major upgrade of nbdev. Whilst the differences
-to nbdev1 aren’t huge, it does require some changes. The old version
-docs are at [nbdev1.fast.ai](https://nbdev1.fast.ai). You can use
-version-pinning in `settings.ini` (i.e `'nbdev<2'`) to stop nbdev from
-upgrading. To upgrade, follow the [migration
-tutorial](https://nbdev.fast.ai/migrating.html).*
-
-------------------------------------------------------------------------
-
 `nbdev` is a notebook-driven development platform. Simply write
 notebooks with lightweight markup and get high-quality documentation,
 tests, continuous integration, and packaging for free!
@@ -115,35 +122,34 @@ available commands:
 !nbdev_help
 ```
 
-    nbdev_bump_version              Increment version in settings.ini by one
-    nbdev_changelog                 Create a CHANGELOG.md file from closed and labeled GitHub issues
-    nbdev_clean                     Clean all notebooks in `fname` to avoid merge conflicts
-    nbdev_conda                     Create a `meta.yaml` file ready to be built into a package, and optionally build and upload it
-    nbdev_create_config             Create a config file.
-    nbdev_deploy                    Deploy docs to GitHub Pages
-    nbdev_docs                      Create Quarto docs and README.md
-    nbdev_export                    Export notebooks in `path` to Python modules
-    nbdev_filter                    A notebook filter for Quarto
-    nbdev_fix                       Create working notebook from conflicted notebook `nbname`
-    nbdev_help                      Show help for all console scripts
-    nbdev_install                   Install Quarto and the current library
-    nbdev_install_hooks             Install Jupyter and git hooks to automatically clean, trust, and fix merge conflicts in notebooks
-    nbdev_install_quarto            Install latest Quarto on macOS or Linux, prints instructions for Windows
-    nbdev_merge                     Git merge driver for notebooks
-    nbdev_migrate                   Convert all directives and callouts in `fname` from v1 to v2
-    nbdev_new                       Create an nbdev project.
-    nbdev_prepare                   Export, test, and clean notebooks, and render README if needed
-    nbdev_preview                   Preview docs locally
-    nbdev_proc_nbs                  Process notebooks in `path` for docs rendering
-    nbdev_pypi                      Create and upload Python package to PyPI
-    nbdev_readme                    None
-    nbdev_release_both              Release both conda and PyPI packages
-    nbdev_release_gh                Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
-    nbdev_release_git               Tag and create a release in GitHub for the current version
-    nbdev_sidebar                   Create sidebar.yml
-    nbdev_test                      Test in parallel notebooks matching `path`, passing along `flags`
-    nbdev_trust                     Trust notebooks matching `fname`
-    nbdev_update                    Propagate change in modules matching `fname` to notebooks that created them
+    nbdev_bump_version        Increment version in settings.ini by one
+    nbdev_changelog           Create a CHANGELOG.md file from closed and labeled GitHub issues
+    nbdev_clean               Clean all notebooks in `fname` to avoid merge conflicts
+    nbdev_conda               Create a `meta.yaml` file ready to be built into a package, and optionally build and upload it
+    nbdev_create_config       Create a config file.
+    nbdev_docs                Create Quarto docs and README.md
+    nbdev_export              Export notebooks in `path` to Python modules
+    nbdev_filter              A notebook filter for Quarto
+    nbdev_fix                 Create working notebook from conflicted notebook `nbname`
+    nbdev_help                Show help for all console scripts
+    nbdev_install             Install Quarto and the current library
+    nbdev_install_hooks       Install Jupyter and git hooks to automatically clean, trust, and fix merge conflicts in notebooks
+    nbdev_install_quarto      Install latest Quarto on macOS or Linux, prints instructions for Windows
+    nbdev_merge               Git merge driver for notebooks
+    nbdev_migrate             Convert all markdown and notebook files in `path` from v1 to v2
+    nbdev_new                 Create an nbdev project.
+    nbdev_prepare             Export, test, and clean notebooks, and render README if needed
+    nbdev_preview             Preview docs locally
+    nbdev_proc_nbs            Process notebooks in `path` for docs rendering
+    nbdev_pypi                Create and upload Python package to PyPI
+    nbdev_readme              Create README.md from readme_nb (index.ipynb by default)
+    nbdev_release_both        Release both conda and PyPI packages
+    nbdev_release_gh          Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
+    nbdev_release_git         Tag and create a release in GitHub for the current version
+    nbdev_sidebar             Create sidebar.yml
+    nbdev_test                Test in parallel notebooks matching `path`, passing along `flags`
+    nbdev_trust               Trust notebooks matching `fname`
+    nbdev_update              Propagate change in modules matching `fname` to notebooks that created them
 
 ## FAQ
 

{nbdev-2.3.12 → nbdev-2.3.14}/README.md

@@ -1,19 +1,9 @@
-Getting Started
-================
+# Getting Started
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 
 ![CI](https://github.com/fastai/nbdev/actions/workflows/test.yaml/badge.svg)
 
-*NB: This is nbdev v2, a major upgrade of nbdev. Whilst the differences
-to nbdev1 aren’t huge, it does require some changes. The old version
-docs are at [nbdev1.fast.ai](https://nbdev1.fast.ai). You can use
-version-pinning in `settings.ini` (i.e `'nbdev<2'`) to stop nbdev from
-upgrading. To upgrade, follow the [migration
-tutorial](https://nbdev.fast.ai/migrating.html).*
-
-------------------------------------------------------------------------
-
 `nbdev` is a notebook-driven development platform. Simply write
 notebooks with lightweight markup and get high-quality documentation,
 tests, continuous integration, and packaging for free!
@@ -92,35 +82,34 @@ available commands:
 !nbdev_help
 ```
 
-    nbdev_bump_version              Increment version in settings.ini by one
-    nbdev_changelog                 Create a CHANGELOG.md file from closed and labeled GitHub issues
-    nbdev_clean                     Clean all notebooks in `fname` to avoid merge conflicts
-    nbdev_conda                     Create a `meta.yaml` file ready to be built into a package, and optionally build and upload it
-    nbdev_create_config             Create a config file.
-    nbdev_deploy                    Deploy docs to GitHub Pages
-    nbdev_docs                      Create Quarto docs and README.md
-    nbdev_export                    Export notebooks in `path` to Python modules
-    nbdev_filter                    A notebook filter for Quarto
-    nbdev_fix                       Create working notebook from conflicted notebook `nbname`
-    nbdev_help                      Show help for all console scripts
-    nbdev_install                   Install Quarto and the current library
-    nbdev_install_hooks             Install Jupyter and git hooks to automatically clean, trust, and fix merge conflicts in notebooks
-    nbdev_install_quarto            Install latest Quarto on macOS or Linux, prints instructions for Windows
-    nbdev_merge                     Git merge driver for notebooks
-    nbdev_migrate                   Convert all directives and callouts in `fname` from v1 to v2
-    nbdev_new                       Create an nbdev project.
-    nbdev_prepare                   Export, test, and clean notebooks, and render README if needed
-    nbdev_preview                   Preview docs locally
-    nbdev_proc_nbs                  Process notebooks in `path` for docs rendering
-    nbdev_pypi                      Create and upload Python package to PyPI
-    nbdev_readme                    None
-    nbdev_release_both              Release both conda and PyPI packages
-    nbdev_release_gh                Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
-    nbdev_release_git               Tag and create a release in GitHub for the current version
-    nbdev_sidebar                   Create sidebar.yml
-    nbdev_test                      Test in parallel notebooks matching `path`, passing along `flags`
-    nbdev_trust                     Trust notebooks matching `fname`
-    nbdev_update                    Propagate change in modules matching `fname` to notebooks that created them
+    nbdev_bump_version        Increment version in settings.ini by one
+    nbdev_changelog           Create a CHANGELOG.md file from closed and labeled GitHub issues
+    nbdev_clean               Clean all notebooks in `fname` to avoid merge conflicts
+    nbdev_conda               Create a `meta.yaml` file ready to be built into a package, and optionally build and upload it
+    nbdev_create_config       Create a config file.
+    nbdev_docs                Create Quarto docs and README.md
+    nbdev_export              Export notebooks in `path` to Python modules
+    nbdev_filter              A notebook filter for Quarto
+    nbdev_fix                 Create working notebook from conflicted notebook `nbname`
+    nbdev_help                Show help for all console scripts
+    nbdev_install             Install Quarto and the current library
+    nbdev_install_hooks       Install Jupyter and git hooks to automatically clean, trust, and fix merge conflicts in notebooks
+    nbdev_install_quarto      Install latest Quarto on macOS or Linux, prints instructions for Windows
+    nbdev_merge               Git merge driver for notebooks
+    nbdev_migrate             Convert all markdown and notebook files in `path` from v1 to v2
+    nbdev_new                 Create an nbdev project.
+    nbdev_prepare             Export, test, and clean notebooks, and render README if needed
+    nbdev_preview             Preview docs locally
+    nbdev_proc_nbs            Process notebooks in `path` for docs rendering
+    nbdev_pypi                Create and upload Python package to PyPI
+    nbdev_readme              Create README.md from readme_nb (index.ipynb by default)
+    nbdev_release_both        Release both conda and PyPI packages
+    nbdev_release_gh          Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
+    nbdev_release_git         Tag and create a release in GitHub for the current version
+    nbdev_sidebar             Create sidebar.yml
+    nbdev_test                Test in parallel notebooks matching `path`, passing along `flags`
+    nbdev_trust               Trust notebooks matching `fname`
+    nbdev_update              Propagate change in modules matching `fname` to notebooks that created them
 
 ## FAQ
 

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/__init__.py

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

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/_modidx.py

@@ -24,7 +24,8 @@ d = { 'settings': { 'branch': 'master',
                            'nbdev.cli.chelp': ('api/cli.html#chelp', 'nbdev/cli.py'),
                            'nbdev.cli.extract_tgz': ('api/cli.html#extract_tgz', 'nbdev/cli.py'),
                            'nbdev.cli.nbdev_filter': ('api/cli.html#nbdev_filter', 'nbdev/cli.py'),
-                           'nbdev.cli.nbdev_new': ('api/cli.html#nbdev_new', 'nbdev/cli.py')},
+                           'nbdev.cli.nbdev_new': ('api/cli.html#nbdev_new', 'nbdev/cli.py'),
+                           'nbdev.cli.nbdev_update_license': ('api/cli.html#nbdev_update_license', 'nbdev/cli.py')},
             'nbdev.config': { 'nbdev.config._apply_defaults': ('api/config.html#_apply_defaults', 'nbdev/config.py'),
                               'nbdev.config._basic_export_nb': ('api/config.html#_basic_export_nb', 'nbdev/config.py'),
                               'nbdev.config._cfg2txt': ('api/config.html#_cfg2txt', 'nbdev/config.py'),
@@ -76,7 +77,9 @@ d = { 'settings': { 'branch': 'master',
                               'nbdev.export.ExportModuleProc._exporti_': ('api/export.html#exportmoduleproc._exporti_', 'nbdev/export.py'),
                               'nbdev.export.ExportModuleProc.begin': ('api/export.html#exportmoduleproc.begin', 'nbdev/export.py'),
                               'nbdev.export.black_format': ('api/export.html#black_format', 'nbdev/export.py'),
-                              'nbdev.export.nb_export': ('api/export.html#nb_export', 'nbdev/export.py')},
+                              'nbdev.export.nb_export': ('api/export.html#nb_export', 'nbdev/export.py'),
+                              'nbdev.export.optional_procs': ('api/export.html#optional_procs', 'nbdev/export.py'),
+                              'nbdev.export.scrub_magics': ('api/export.html#scrub_magics', 'nbdev/export.py')},
             'nbdev.extract_attachments': {},
             'nbdev.frontmatter': { 'nbdev.frontmatter.FrontmatterProc': ('api/frontmatter.html#frontmatterproc', 'nbdev/frontmatter.py'),
                                    'nbdev.frontmatter.FrontmatterProc._update': ( 'api/frontmatter.html#frontmatterproc._update',
@@ -231,7 +234,10 @@ d = { 'settings': { 'branch': 'master',
                            'nbdev.qmd.meta': ('api/qmd.html#meta', 'nbdev/qmd.py'),
                            'nbdev.qmd.tbl_row': ('api/qmd.html#tbl_row', 'nbdev/qmd.py'),
                            'nbdev.qmd.tbl_sep': ('api/qmd.html#tbl_sep', 'nbdev/qmd.py')},
-            'nbdev.quarto': { 'nbdev.quarto._SidebarYmlRemoved': ('api/quarto.html#_sidebarymlremoved', 'nbdev/quarto.py'),
+            '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__',
@@ -246,6 +252,7 @@ d = { 'settings': { 'branch': 'master',
                               '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_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-2.3.12 → nbdev-2.3.14}/nbdev/cli.py

@@ -25,7 +25,7 @@ from contextlib import redirect_stdout
 import os, tarfile, sys
 
 # %% auto 0
-__all__ = ['nbdev_filter', 'extract_tgz', 'nbdev_new', 'chelp']
+__all__ = ['mapping', 'nbdev_filter', 'extract_tgz', 'nbdev_new', 'nbdev_update_license', 'chelp']
 
 # %% ../nbs/api/13_cli.ipynb 5
 @call_parse
@@ -67,7 +67,7 @@ def _render_nb(fn, cfg):
 def _update_repo_meta(cfg):
     "Enable gh pages and update the homepage and description in your GitHub repo."
     token=os.getenv('GITHUB_TOKEN')
-    if token: 
+    if token:
         from ghapi.core import GhApi
         api = GhApi(owner=cfg.user, repo=cfg.repo, token=token)
         try: api.repos.update(homepage=f'{cfg.doc_host}{cfg.doc_baseurl}', description=cfg.description)
@@ -85,13 +85,28 @@ def nbdev_new(**kwargs):
     _update_repo_meta(cfg)
 
     path = Path()
-    with warnings.catch_warnings():
-        warnings.simplefilter('ignore', UserWarning)
-        tag = GhApi(gh_host='https://api.github.com', authenticate=False).repos.get_latest_release('fastai', 'nbdev-template').tag_name
-    url = f"https://github.com/fastai/nbdev-template/archive/{tag}.tar.gz"
-    extract_tgz(url)
-    tmpl_path = path/f'nbdev-template-{tag}'
 
+    _ORG_OR_USR = 'fastai'
+    _REPOSITORY = 'nbdev-template'
+    _TEMPLATE = f'{_ORG_OR_USR}/{_TEMPLATE}'
+    template = kwargs.get('template', _TEMPLATE)
+    try:
+        org_or_usr, repo = template.split('/')
+    except ValueError:
+        org_or_usr, repo = _ORG_OR_USR, _REPOSITORY
+
+
+    tag = kwargs.get('tag', None)
+    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
+
+    url = f"https://github.com/{org_or_usr}/{repo}/archive/{tag}.tar.gz"
+    extract_tgz(url)
+    tmpl_path = path/f'{repo}-{tag}'
+    
     cfg.nbs_path.mkdir(exist_ok=True)
     nbexists = bool(first(cfg.nbs_path.glob('*.ipynb')))
     _nbs_path_sufs = ('.ipynb','.css')
@@ -108,7 +123,47 @@ def nbdev_new(**kwargs):
     nbdev_export.__wrapped__()
     nbdev_readme.__wrapped__()
 
-# %% ../nbs/api/13_cli.ipynb 15
+# %% ../nbs/api/13_cli.ipynb 13
+mapping = {
+  'mit': 'mit',
+  'apache2': 'apache-2.0',
+  'gpl2': 'gpl-2.0',
+  'gpl3': 'gpl-3.0',
+  'bsd3': 'bsd-3-clause'
+}
+
+# %% ../nbs/api/13_cli.ipynb 14
+@call_parse
+def nbdev_update_license(
+    to: str=None, # update license to
+):
+    "Allows you to update the license of your project."
+    from ghapi.core import GhApi
+    warnings.filterwarnings("ignore")
+    avail_lic = GhApi().licenses.get_all_commonly_used().map(lambda x: x['key'])
+
+    cfg = get_config()
+    curr_lic = cfg['license']
+
+    mapped = mapping.get(to, None)
+
+    if mapped not in avail_lic: raise ValueError(f"{to} is not an available license")
+    body = GhApi().licenses.get(mapped)['body']
+
+    body = body.replace('[year], [fullname]', cfg['copyright'])
+    body = body.replace('[year] [fullname]', cfg['copyright'])
+
+    content = open("settings.ini", "r").read()
+    content = re.sub(r"^(license\s*=\s*).*?$", r"\1 " + to, content, flags=re.MULTILINE)
+
+    config = open("settings.ini", "w")
+    config.write(content)
+
+    lic = open('LICENSE', 'w')
+    lic.write(body)
+    print(f"License updated from {curr_lic} to {to}")
+
+# %% ../nbs/api/13_cli.ipynb 17
 @call_parse
 def chelp():
     "Show help for all console scripts"

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/config.py

@@ -91,7 +91,7 @@ def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
         msg= [f"""Could not access repo: {owner}/{repo} to find your default branch - `{default_branch}` assumed.
 Edit `settings.ini` if this is incorrect.
 In the future, you can allow nbdev to see private repos by setting the environment variable GITHUB_TOKEN as described here:
-https://nbdev.fast.ai/cli.html#Using-nbdev_new-with-private-repos"""]
+https://nbdev.fast.ai/api/release.html#setup"""]
         print(''.join(msg))
         return default_branch,default_kw,''
     
@@ -152,6 +152,8 @@ _nbdev_cfg_tail = '''### Optional ###
 # requirements = fastcore pandas
 # dev_requirements = 
 # console_scripts =
+# conda_user = 
+# package_data = 
 '''
 
 # %% ../nbs/api/01_config.ipynb 21

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/doclinks.py

@@ -46,7 +46,7 @@ def patch_name(o):
 def _iter_py_cells(p):
     "Yield cells from an exported Python file."
     p = Path(p)
-    cells = p.read_text().split("\n# %% ")
+    cells = p.read_text(encoding='utf-8').split("\n# %% ")
     for cell in cells[1:]:
         top,code = cell.split('\n', 1)
         try:
@@ -93,7 +93,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     idxfile = dest/'_modidx.py'
     if skip_exists and idxfile.exists(): return
     with contextlib.suppress(FileNotFoundError): idxfile.unlink()
-    if idxfile.exists(): res = exec_local(idxfile.read_text(), 'd')
+    if idxfile.exists(): res = exec_local(idxfile.read_text(encoding='utf-8'), 'd')
     else: res = dict(syms={}, settings={}) 
     res['settings'] = {k:v for k,v in get_config().d.items()
                        if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}
@@ -131,19 +131,23 @@ def nbglob_cli(
 @delegates(nbglob_cli)
 def nbdev_export(
     path:str=None, # Path or filename
+    procs:Param("tokens naming the export processors to use.", nargs="*", choices=optional_procs())="black_format",
     **kwargs):
     "Export notebooks in `path` to Python modules"
     if os.environ.get('IN_TEST',0): return
+    if procs:
+      import nbdev.export
+      procs = [getattr(nbdev.export, p) for p in L(procs)]
     files = nbglob(path=path, as_path=True, **kwargs).sorted('name')
-    for f in files: nb_export(f)
+    for f in files: nb_export(f, procs=procs)
     add_init(get_config().lib_path)
     _build_modidx()
 
-# %% ../nbs/api/05_doclinks.ipynb 24
+# %% ../nbs/api/05_doclinks.ipynb 25
 import importlib,ast
 from functools import lru_cache
 
-# %% ../nbs/api/05_doclinks.ipynb 25
+# %% ../nbs/api/05_doclinks.ipynb 26
 def _find_mod(mod):
     mp,_,mr = mod.partition('/')
     spec = importlib.util.find_spec(mp)
@@ -155,7 +159,7 @@ def _find_mod(mod):
 def _get_exps(mod):
     mf = _find_mod(mod)
     if not mf: return {}
-    txt = mf.read_text()
+    txt = mf.read_text(encoding='utf-8')
     _def_types = ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef
     d = {}
     for tree in ast.parse(txt).body:
@@ -166,7 +170,7 @@ def _get_exps(mod):
 
 def _lineno(sym, fname): return _get_exps(fname).get(sym, None) if fname else None
 
-# %% ../nbs/api/05_doclinks.ipynb 27
+# %% ../nbs/api/05_doclinks.ipynb 28
 def _qual_sym(s, settings):
     if not isinstance(s,tuple): return s
     nb,py = s
@@ -181,10 +185,10 @@ def _qual_syms(entries):
     if 'doc_host' not in settings: return entries
     return {'syms': {mod:_qual_mod(d, settings) for mod,d in entries['syms'].items()}, 'settings':settings}
 
-# %% ../nbs/api/05_doclinks.ipynb 28
+# %% ../nbs/api/05_doclinks.ipynb 29
 _re_backticks = re.compile(r'`([^`\s]+)`')
 
-# %% ../nbs/api/05_doclinks.ipynb 29
+# %% ../nbs/api/05_doclinks.ipynb 30
 @lru_cache(None)
 class NbdevLookup:
     "Mapping from symbol names to docs and source URLs"

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/export.py

@@ -1,7 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/04_export.ipynb.
 
 # %% auto 0
-__all__ = ['ExportModuleProc', 'black_format', 'nb_export']
+__all__ = ['ExportModuleProc', 'black_format', 'scrub_magics', 'optional_procs', 'nb_export']
 
 # %% ../nbs/api/04_export.ipynb 2
 from .config import *
@@ -26,7 +26,7 @@ class ExportModuleProc:
         self.in_all[ifnone(exp_to, '#')].append(cell)
     _exports_=_export_
 
-# %% ../nbs/api/04_export.ipynb 7
+# %% ../nbs/api/04_export.ipynb 8
 def black_format(cell, # Cell to format
                  force=False): # Turn black formatting on regardless of settings.ini
     "Processor to format code with `black`"
@@ -40,8 +40,27 @@ def black_format(cell, # Cell to format
         try: cell.source = _format_str(cell.source).strip()
         except: pass
 
-# %% ../nbs/api/04_export.ipynb 9
-def nb_export(nbname, lib_path=None, procs=black_format, debug=False, mod_maker=ModuleMaker, name=None):
+# %% ../nbs/api/04_export.ipynb 10
+# includes the newline, because calling .strip() would affect all cells.
+_magics_pattern = re.compile(r'^\s*(%%|%).*\n?', re.MULTILINE)
+
+def scrub_magics(cell): # Cell to format
+    "Processor to remove cell magics from exported code"
+    try: cfg = get_config()
+    except FileNotFoundError: return
+    if cell.cell_type != 'code': return
+    try: cell.source = _magics_pattern.sub('', cell.source)
+    except: pass
+
+# %% ../nbs/api/04_export.ipynb 13
+import nbdev.export
+def optional_procs():
+    "An explicit list of processors that could be used by `nb_export`"
+    return L([p for p in nbdev.export.__all__
+              if p not in ["nb_export", "ExportModuleProc", "optional_procs"]])
+
+# %% ../nbs/api/04_export.ipynb 16
+def nb_export(nbname, lib_path=None, procs=None, debug=False, mod_maker=ModuleMaker, name=None):
     "Create module(s) from notebook"
     if lib_path is None: lib_path = get_config().lib_path
     exp = ExportModuleProc()

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/frontmatter.py

@@ -63,5 +63,10 @@ class FrontmatterProc(Processor):
     def end(self):
         self.nb.frontmatter_ = self.fm
         if not self.fm: return
+        if not hasattr(self.nb, 'path_'):
+            raise AttributeError('Notebook missing `path_` attribute.\n\nPlease remove any nbdev-related notebook filters '
+                                 'from your _quarto.yml file (e.g. `ipynb-filter: [nbdev_filter]`), since they are no '
+                                 'longer supported as of nbdev v2.3. See the v2.3 launch post for more information: '
+                                 'https://forums.fast.ai/t/upcoming-changes-in-v2-3-edit-now-released/98905.')
         self.fm.update({'output-file': _nbpath2html(Path(self.nb.path_)).name})
         _insertfm(self.nb, self.fm)

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/maker.py

@@ -47,7 +47,7 @@ def update_var(varname, func, fn=None, code=None):
     "Update the definition of `varname` in file `fn`, by calling `func` with the current definition"
     if fn:
         fn = Path(fn)
-        code = fn.read_text()
+        code = fn.read_text(encoding='utf-8')
     lines = code.splitlines()
     v = read_var(code, varname)
     res = func(v)

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/merge.py

@@ -63,7 +63,7 @@ def nbdev_fix(nbname:str, # Notebook filename to fix
     "Create working notebook from conflicted notebook `nbname`"
     nbname = Path(nbname)
     if not nobackup and not outname: shutil.copy(nbname, nbname.with_suffix('.ipynb.bak'))
-    nbtxt = nbname.read_text()
+    nbtxt = nbname.read_text(encoding='utf-8')
     a,b,branch1,branch2 = unpatch(nbtxt)
     ac,bc = dict2nb(loads(a)),dict2nb(loads(b))
     dest = bc if theirs else ac
@@ -85,7 +85,7 @@ def _git_rebase_head():
     for d in ('apply','merge'):
         d = Path(f'.git/rebase-{d}')
         if d.is_dir():
-            cmt = (d/'orig-head').read_text()
+            cmt = (d/'orig-head').read_text(encoding='utf-8')
             msg = run(f'git show-branch --no-name {cmt}')
             return f'{cmt[:7]} ({msg})'
 

{nbdev-2.3.12 → nbdev-2.3.14}/nbdev/process.py

@@ -33,6 +33,7 @@ def _quarto_re(lang=None): return re.compile(_dir_pre(lang) + r'\s*[\w|-]+\s*:')
 # %% ../nbs/api/03_process.ipynb 11
 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 ':' in s: s = s.replace(':', ': ')
     s = (s.strip()[2:]).strip().split()
     if not s: return None
@@ -70,22 +71,22 @@ def extract_directives(cell, remove=True, lang='python'):
         cell['source'] = ''.join([_norm_quarto(o, lang) for o in dirs if _quarto_re(lang).match(o) or _cell_mgc.match(o)] + code)
     return dict(L(_directive(s, lang) for s in dirs).filter())
 
-# %% ../nbs/api/03_process.ipynb 22
+# %% ../nbs/api/03_process.ipynb 21
 def opt_set(var, newval):
     "newval if newval else var"
     return newval if newval else var
 
-# %% ../nbs/api/03_process.ipynb 23
+# %% ../nbs/api/03_process.ipynb 22
 def instantiate(x, **kwargs):
     "Instantiate `x` if it's a type"
     return x(**kwargs) if isinstance(x,type) else x
 
 def _mk_procs(procs, nb): return L(procs).map(instantiate, nb=nb)
 
-# %% ../nbs/api/03_process.ipynb 24
+# %% ../nbs/api/03_process.ipynb 23
 def _is_direc(f): return getattr(f, '__name__', '-')[-1]=='_'
 
-# %% ../nbs/api/03_process.ipynb 25
+# %% ../nbs/api/03_process.ipynb 24
 class NBProcessor:
     "Process cells and nbdev comments in a notebook"
     def __init__(self, path=None, procs=None, nb=None, debug=False, rm_directives=True, process=False):
@@ -125,7 +126,7 @@ class NBProcessor:
         "Process all cells with all processors"
         for proc in self.procs: self._proc(proc)
 
-# %% ../nbs/api/03_process.ipynb 35
+# %% ../nbs/api/03_process.ipynb 34
 class Processor:
     "Base class for processors"
     def __init__(self, nb): self.nb = nb