fixes #1558

Author: jph00

.gitignore

@@ -1,3 +1,4 @@
+dlgs/
 archived/
 SOLVEIT.ipynb
 _publish.yml

nbdev/__init__.py

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

nbdev/_modidx.py

@@ -28,23 +28,27 @@
                            '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.cli.watch_export': ('api/cli.html#watch_export', 'nbdev/cli.py')},
-            'nbdev.config': { 'nbdev.config._apply_defaults': ('api/config.html#_apply_defaults', 'nbdev/config.py'),
+            'nbdev.config': { 'nbdev.config.ConfigToml': ('api/config.html#configtoml', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.__getattr__': ('api/config.html#configtoml.__getattr__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.__init__': ('api/config.html#configtoml.__init__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.get': ('api/config.html#configtoml.get', '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'),
                               'nbdev.config._fetch_from_git': ('api/config.html#_fetch_from_git', 'nbdev/config.py'),
+                              'nbdev.config._find_nbdev_pyproject': ('api/config.html#_find_nbdev_pyproject', 'nbdev/config.py'),
                               'nbdev.config._get_info': ('api/config.html#_get_info', 'nbdev/config.py'),
                               'nbdev.config._git_repo': ('api/config.html#_git_repo', 'nbdev/config.py'),
+                              'nbdev.config._has_nbdev': ('api/config.html#_has_nbdev', 'nbdev/config.py'),
                               'nbdev.config._has_py': ('api/config.html#_has_py', 'nbdev/config.py'),
-                              'nbdev.config._nbdev_config_file': ('api/config.html#_nbdev_config_file', 'nbdev/config.py'),
-                              'nbdev.config._prompt_user': ('api/config.html#_prompt_user', 'nbdev/config.py'),
-                              'nbdev.config._type': ('api/config.html#_type', 'nbdev/config.py'),
-                              'nbdev.config._xdg_config_paths': ('api/config.html#_xdg_config_paths', 'nbdev/config.py'),
+                              'nbdev.config._load_toml': ('api/config.html#_load_toml', 'nbdev/config.py'),
+                              'nbdev.config._user_config': ('api/config.html#_user_config', 'nbdev/config.py'),
                               'nbdev.config.add_init': ('api/config.html#add_init', 'nbdev/config.py'),
-                              'nbdev.config.config_key': ('api/config.html#config_key', 'nbdev/config.py'),
+                              'nbdev.config.bump_version': ('api/config.html#bump_version', 'nbdev/config.py'),
                               'nbdev.config.create_output': ('api/config.html#create_output', 'nbdev/config.py'),
                               'nbdev.config.get_config': ('api/config.html#get_config', 'nbdev/config.py'),
                               '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.read_version': ('api/config.html#read_version', 'nbdev/config.py'),
+                              'nbdev.config.set_version': ('api/config.html#set_version', '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'),
@@ -165,7 +169,8 @@
                                'nbdev.migrate.fp_md_fm': ('api/migrate.html#fp_md_fm', 'nbdev/migrate.py'),
                                'nbdev.migrate.migrate_md': ('api/migrate.html#migrate_md', 'nbdev/migrate.py'),
                                'nbdev.migrate.migrate_nb': ('api/migrate.html#migrate_nb', 'nbdev/migrate.py'),
-                               'nbdev.migrate.nbdev_migrate': ('api/migrate.html#nbdev_migrate', 'nbdev/migrate.py')},
+                               'nbdev.migrate.nbdev_migrate': ('api/migrate.html#nbdev_migrate', 'nbdev/migrate.py'),
+                               'nbdev.migrate.nbdev_migrate_config': ('api/migrate.html#nbdev_migrate_config', 'nbdev/migrate.py')},
             'nbdev.process': { 'nbdev.process.NBProcessor': ('api/process.html#nbprocessor', 'nbdev/process.py'),
                                'nbdev.process.NBProcessor.__init__': ('api/process.html#nbprocessor.__init__', 'nbdev/process.py'),
                                'nbdev.process.NBProcessor._proc': ('api/process.html#nbprocessor._proc', 'nbdev/process.py'),
@@ -303,7 +308,6 @@
                                'nbdev.release._run': ('api/release.html#_run', 'nbdev/release.py'),
                                'nbdev.release._write_yaml': ('api/release.html#_write_yaml', 'nbdev/release.py'),
                                'nbdev.release.anaconda_upload': ('api/release.html#anaconda_upload', 'nbdev/release.py'),
-                               'nbdev.release.bump_version': ('api/release.html#bump_version', 'nbdev/release.py'),
                                'nbdev.release.changelog': ('api/release.html#changelog', 'nbdev/release.py'),
                                'nbdev.release.chk_conda_rel': ('api/release.html#chk_conda_rel', 'nbdev/release.py'),
                                'nbdev.release.conda_output_path': ('api/release.html#conda_output_path', 'nbdev/release.py'),

nbdev/clean.py

@@ -125,8 +125,8 @@ def process_write(warn_msg, proc_nb, f_in, f_out=None, disp=False):
 def _nbdev_clean(nb, path=None, clear_all=None):
     cfg = get_config(path=path)
     clear_all = clear_all or cfg.clear_all
-    allowed_metadata_keys = cfg.get("allowed_metadata_keys").split()
-    allowed_cell_metadata_keys = cfg.get("allowed_cell_metadata_keys").split()
+    allowed_metadata_keys = cfg.get("allowed_metadata_keys") or []
+    allowed_cell_metadata_keys = cfg.get("allowed_cell_metadata_keys") or []
     clean_nb(nb, clear_all, allowed_metadata_keys, allowed_cell_metadata_keys, cfg.clean_ids)
     if path: nbdev_trust.__wrapped__(path)
 

nbdev/cli.py

@@ -65,7 +65,7 @@ def _render_nb(fn, cfg):
     "Render templated values like `{{lib_name}}` in notebook at `fn` from `cfg`"
     txt = fn.read_text()
     txt = txt.replace('from your_lib.core', f'from {cfg.lib_path}.core') # for compatibility with old templates
-    for k,v in cfg.d.items(): txt = txt.replace('{{'+k+'}}', v)
+    for k,v in cfg.items(): txt = txt.replace('{{'+k+'}}', str(v))
     fn.write_text(txt)
 
 # %% ../nbs/api/13_cli.ipynb #dd385911-aa8f-44e7-8d46-7b8a20f3b010
@@ -87,10 +87,11 @@ def nbdev_new(**kwargs):
     from ghapi.core import GhApi
     nbdev_create_config.__wrapped__(**kwargs)
     cfg = get_config()
-    _update_repo_meta(cfg)
+    if (Path('.git')).exists(): _update_repo_meta(cfg)
+    else: print(f"No git repo found. Run: gh repo create {cfg.user}/{cfg.repo} --public --source=.")
     path = Path()
 
-    _ORG_OR_USR,_REPOSITORY = 'answerdotai','nbdev-template'
+    _ORG_OR_USR,_REPOSITORY = 'answerdotai','nbdev3-template'
     _TEMPLATE = f'{_ORG_OR_USR}/{_REPOSITORY}'
     template = kwargs.get('template', _TEMPLATE)
     try: org_or_usr, repo = template.split('/')
@@ -143,24 +144,23 @@ def nbdev_update_license(
     avail_lic = GhApi().licenses.get_all_commonly_used().map(lambda x: x['key'])
 
     cfg = get_config()
-    curr_lic = cfg['license']
+    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)
+    copyright = f"{datetime.now().year}, {cfg.author}"
+    body = body.replace('[year], [fullname]', copyright)
+    body = body.replace('[year] [fullname]', copyright)
 
-    config = open("settings.ini", "w")
-    config.write(content)
+    # Update pyproject.toml
+    pyproj = cfg.config_file
+    content = pyproj.read_text()
+    content = re.sub(r'^(license\s*=\s*\{text\s*=\s*").*?(")', rf'\g<1>{to}\2', content, flags=re.MULTILINE)
+    pyproj.write_text(content)
 
-    lic = open('LICENSE', 'w')
-    lic.write(body)
+    Path('LICENSE').write_text(body)
     print(f"License updated from {curr_lic} to {to}")
 
 # %% ../nbs/api/13_cli.ipynb #412b4cd2