nbdev 2.4.14__py3-none-any.whl → 3.0.1__py3-none-any.whl

nbdev/__init__.py

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

nbdev/_modidx.py

@@ -28,23 +28,31 @@ d = { 'settings': { 'branch': 'main',
                            '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.__getitem__': ('api/config.html#configtoml.__getitem__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.__init__': ('api/config.html#configtoml.__init__', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.d': ('api/config.html#configtoml.d', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.get': ('api/config.html#configtoml.get', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.path': ('api/config.html#configtoml.path', 'nbdev/config.py'),
+                              'nbdev.config.ConfigToml.version': ('api/config.html#configtoml.version', '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'),
@@ -145,15 +153,20 @@ d = { 'settings': { 'branch': 'main',
                              'nbdev.merge.unpatch': ('api/merge.html#unpatch', 'nbdev/merge.py')},
             'nbdev.migrate': { 'nbdev.migrate.MigrateProc': ('api/migrate.html#migrateproc', 'nbdev/migrate.py'),
                                'nbdev.migrate.MigrateProc.begin': ('api/migrate.html#migrateproc.begin', 'nbdev/migrate.py'),
+                               'nbdev.migrate._build_classifiers': ('api/migrate.html#_build_classifiers', 'nbdev/migrate.py'),
                                'nbdev.migrate._cat_slug': ('api/migrate.html#_cat_slug', 'nbdev/migrate.py'),
                                'nbdev.migrate._co': ('api/migrate.html#_co', 'nbdev/migrate.py'),
                                'nbdev.migrate._convert_callout': ('api/migrate.html#_convert_callout', 'nbdev/migrate.py'),
                                'nbdev.migrate._convert_video': ('api/migrate.html#_convert_video', 'nbdev/migrate.py'),
                                'nbdev.migrate._file_slug': ('api/migrate.html#_file_slug', 'nbdev/migrate.py'),
+                               'nbdev.migrate._fmt_script': ('api/migrate.html#_fmt_script', 'nbdev/migrate.py'),
                                'nbdev.migrate._fp_convert': ('api/migrate.html#_fp_convert', 'nbdev/migrate.py'),
                                'nbdev.migrate._fp_fm': ('api/migrate.html#_fp_fm', 'nbdev/migrate.py'),
                                'nbdev.migrate._fp_image': ('api/migrate.html#_fp_image', 'nbdev/migrate.py'),
                                'nbdev.migrate._is_jekyll_post': ('api/migrate.html#_is_jekyll_post', 'nbdev/migrate.py'),
+                               'nbdev.migrate._migrate_workflows': ('api/migrate.html#_migrate_workflows', 'nbdev/migrate.py'),
+                               'nbdev.migrate._nbdev_migrate_config': ('api/migrate.html#_nbdev_migrate_config', 'nbdev/migrate.py'),
+                               'nbdev.migrate._py_val': ('api/migrate.html#_py_val', 'nbdev/migrate.py'),
                                'nbdev.migrate._re_v1': ('api/migrate.html#_re_v1', 'nbdev/migrate.py'),
                                'nbdev.migrate._repl_directives': ('api/migrate.html#_repl_directives', 'nbdev/migrate.py'),
                                'nbdev.migrate._repl_v1dir': ('api/migrate.html#_repl_v1dir', 'nbdev/migrate.py'),
@@ -161,11 +174,13 @@ d = { 'settings': { 'branch': 'main',
                                'nbdev.migrate._replace_fm': ('api/migrate.html#_replace_fm', 'nbdev/migrate.py'),
                                'nbdev.migrate._rm_quote': ('api/migrate.html#_rm_quote', 'nbdev/migrate.py'),
                                'nbdev.migrate._subv1': ('api/migrate.html#_subv1', 'nbdev/migrate.py'),
+                               'nbdev.migrate._toml_val': ('api/migrate.html#_toml_val', 'nbdev/migrate.py'),
                                'nbdev.migrate._v': ('api/migrate.html#_v', 'nbdev/migrate.py'),
                                '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 +318,6 @@ d = { 'settings': { 'branch': 'main',
                                '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

nbdev/config.py

@@ -3,8 +3,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_config.ipynb.
 
 # %% auto #0
-__all__ = ['pyproj_tmpl', 'nbdev_create_config', 'get_config', 'config_key', 'is_nbdev', 'create_output', 'show_src',
-           'update_version', 'update_proj', 'add_init', 'write_cells']
+__all__ = ['pyproject_nm', 'pyproject_tmpl', 'nbdev_defaults', 'pyproj_tmpl', 'nbdev_create_config', 'ConfigToml', 'get_config',
+           'is_nbdev', 'create_output', 'show_src', 'read_version', 'set_version', 'bump_version', 'update_version',
+           'update_proj', 'add_init', 'write_cells']
 
 # %% ../nbs/api/01_config.ipynb #6fd14ecd
 from datetime import datetime
@@ -20,66 +21,19 @@ from IPython.display import Markdown
 from execnb.nbio import read_nb,NbCell
 from urllib.error import HTTPError
 
+try: import tomllib
+except ImportError: import tomli as tomllib
+
 # %% ../nbs/api/01_config.ipynb #117128e6
-_nbdev_home_dir = 'nbdev' # sub-directory of xdg base dir
-_nbdev_cfg_name = 'settings.ini'
+pyproject_nm = 'pyproject.toml'
+_nbdev_home_dir = 'nbdev'
+_user_cfg_name = 'config.toml'
 
 # %% ../nbs/api/01_config.ipynb #adf0834f
 def _git_repo():
     try: return repo_details(run('git config --get remote.origin.url'))[1]
     except OSError: return
 
-# %% ../nbs/api/01_config.ipynb #efccb7f2
-# When adding a named default to the list below, be sure that that name
-# is also added to one of the sections in `_nbdev_cfg_sections` as well,
-# or it won't get written by `nbdev_create_config`:
-def _apply_defaults(
-    cfg,
-    lib_name='%(repo)s', # Package name
-    git_url='https://github.com/%(user)s/%(repo)s', # Repo URL
-    custom_sidebar:bool_arg=False, # Use a custom sidebar.yml?
-    nbs_path:Path='nbs', # Path to notebooks
-    lib_path:Path=None, # Path to package root (default: `repo` with `-` replaced by `_`)
-    doc_path:Path='_docs', # Path to rendered docs
-    tst_flags='notest', # Test flags
-    version='0.0.1', # Version of this release
-    doc_host='https://%(user)s.github.io',  # Hostname for docs
-    doc_baseurl='/%(repo)s',  # Base URL for docs
-    keywords='nbdev jupyter notebook python', # Package keywords
-    license='apache2', # License for the package
-    copyright:str=None, # Copyright for the package, defaults to '`current_year` onwards, `author`'
-    status='3', # Development status PyPI classifier
-    min_python='3.9', # Minimum Python version PyPI classifier
-    audience='Developers', # Intended audience PyPI classifier
-    language='English', # Language PyPI classifier
-    recursive:bool_arg=True, # Include subfolders in notebook globs?
-    black_formatting:bool_arg=False, # Format libraries with black?
-    readme_nb='index.ipynb', # Notebook to export as repo readme
-    title='%(lib_name)s', # Quarto website title
-    allowed_metadata_keys='', # Preserve the list of keys in the main notebook metadata
-    allowed_cell_metadata_keys='', # Preserve the list of keys in cell level metadata
-    jupyter_hooks:bool_arg=False, # Run Jupyter hooks?
-    clean_ids:bool_arg=True, # Remove ids from plaintext reprs?
-    clear_all:bool_arg=False, # Remove all cell metadata and cell outputs?
-    put_version_in_init:bool_arg=True, # Add the version to the main __init__.py in nbdev_export
-    update_pyproject:bool_arg=True, # Create/update pyproject.toml with correct project name
-    skip_procs:str='', # A comma-separated list of processors that you want to skip
-):
-    "Apply default settings where missing in `cfg`."
-    if 'cell_number' in cfg:
-        warnings.warn("`cell_number` in settings.ini is deprecated and ignored. Cell IDs are now used instead.", DeprecationWarning)
-    if getattr(cfg,'repo',None) is None:
-        cfg.repo = _git_repo()
-        if cfg.repo is None:
-            _parent = Path.cwd()
-            cfg.repo = _parent.parent.name if _parent.name=='nbs' else _parent.name
-    if lib_path is None: lib_path = cfg.repo.replace('-', '_')
-    if copyright is None: copyright = f"{datetime.now().year} onwards, %(author)s"
-    for k,v in locals().items():
-        if k.startswith('_') or k == 'cfg' or cfg.get(k) is not None: continue
-        cfg[k] = v
-    return cfg
-
 # %% ../nbs/api/01_config.ipynb #6eeafafd
 def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
     from ghapi.all import GhApi
@@ -88,7 +42,7 @@ def _get_info(owner, repo, default_branch='main', default_kw='nbdev'):
     try: r = api.repos.get()
     except HTTPError:
         msg= [f"""Could not access repo: {owner}/{repo} to find your default branch - `{default_branch}` assumed.
-Edit `settings.ini` if this is incorrect.
+Edit `pyproject.toml` 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/api/release.html#setup"""]
         print(''.join(msg))
@@ -98,125 +52,204 @@ https://nbdev.fast.ai/api/release.html#setup"""]
 
 # %% ../nbs/api/01_config.ipynb #35d5c037
 def _fetch_from_git(raise_err=False):
-    "Get information for settings.ini from the user."
+    "Get information for pyproject.toml from git."
     res={}
     try:
         url = run('git config --get remote.origin.url')
         res['user'],res['repo'] = repo_details(url)
         res['branch'],res['keywords'],desc = _get_info(owner=res['user'], repo=res['repo'])
         if desc: res['description'] = desc
-        res['author'] = run('git config --get user.name').strip() # below two lines attempt to pull from global user config
+        res['author'] = run('git config --get user.name').strip()
         res['author_email'] = run('git config --get user.email').strip()
     except OSError as e:
         if raise_err: raise(e)
     else: res['lib_name'] = res['repo'].replace('-','_')
     return res
 
-# %% ../nbs/api/01_config.ipynb #999c74f6
-def _prompt_user(cfg, inferred):
-    "Let user input values not in `cfg` or `inferred`."
-    res = cfg.copy()
-    for k,v in cfg.items():
-        inf = inferred.get(k,None)
-        msg = S.light_blue(k) + ' = '
-        if v is None:
-            if inf is None: res[k] = input(f'# Please enter a value for {k}\n'+msg)
-            else:
-                res[k] = inf
-                print(msg+res[k]+' # Automatically inferred from git')
-    return res
-
-# %% ../nbs/api/01_config.ipynb #8348a963
-def _cfg2txt(cfg, head, sections, tail=''):
-    "Render `cfg` with commented sections."
-    nm = cfg.d.name
-    res = f'[{nm}]\n'+head
-    for t,ks in sections.items():
-        res += f'### {t} ###\n'
-        for k in ks.split(): res += f"{k} = {cfg._cfg.get(nm, k, raw=True)}\n" # TODO: add `raw` to `Config.get`
-        res += '\n'
-    res += tail
-    return res.strip()
-
-# %% ../nbs/api/01_config.ipynb #a4ef6546
-_nbdev_cfg_head = '''# All sections below are required unless otherwise specified.
-# See https://github.com/AnswerDotAI/nbdev/blob/main/settings.ini for examples.
+# %% ../nbs/api/01_config.ipynb #05aae09f
+pyproject_tmpl = '''[build-system]
+requires = ["setuptools>=64"]
+build-backend = "setuptools.build_meta"
 
-'''
-_nbdev_cfg_sections = {'Python library': 'repo lib_name version min_python license black_formatting',
-                       'nbdev': 'doc_path lib_path nbs_path recursive tst_flags put_version_in_init update_pyproject',
-                       'Docs': 'branch custom_sidebar doc_host doc_baseurl git_url title',
-                       'PyPI': 'audience author author_email copyright description keywords language status user'}
-_nbdev_cfg_tail = '''### Optional ###
-# requirements = fastcore pandas
-# dev_requirements = 
-# console_scripts =
-# conda_user = 
-# package_data = 
+[project]
+name = "{name}"
+dynamic = ["version"]
+description = "{description}"
+readme = "README.md"
+requires-python = ">={min_python}"
+license = {{text = "{license}"}}
+authors = [{{name = "{author}", email = "{author_email}"}}]
+keywords = {keywords}
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+]
+dependencies = []
+
+[project.urls]
+Repository = "{git_url}"
+Documentation = "{doc_url}"
+
+[project.entry-points.nbdev]
+{lib_path} = "{lib_path}._modidx:d"
+
+[tool.setuptools.dynamic]
+version = {{attr = "{lib_path}.__version__"}}
+
+[tool.setuptools.packages.find]
+include = ["{lib_path}"]
+
+[tool.nbdev]
 '''
 
-# %% ../nbs/api/01_config.ipynb #05aae09f
+# %% ../nbs/api/01_config.ipynb #3fc5c33f
 @call_parse
-@delegates(_apply_defaults, but='cfg')
 def nbdev_create_config(
     repo:str=None, # Repo name
-    branch:str=None, # Repo default branch
+    branch:str='main', # Repo default branch
     user:str=None, # Repo username
     author:str=None, # Package author's name
     author_email:str=None, # Package author's email address
-    description:str=None, # Short summary of the package
+    description:str='', # Short summary of the package
     path:str='.', # Path to create config file
-    cfg_name:str=_nbdev_cfg_name, # Name of config file to create
-    **kwargs
+    min_python:str='3.10', # Minimum Python version
+    license:str='Apache-2.0', # License (SPDX identifier)
 ):
-    "Create a config file."
-    req = {k:v for k,v in locals().items() if k not in ('path','cfg_name','kwargs')}
+    "Create a pyproject.toml config file."
+    path = Path(path)
+    path.mkdir(exist_ok=True, parents=True)
+    
+    # Infer from git if not provided
     inf = _fetch_from_git()
-    d = _prompt_user(req, inf)
-    cfg = Config(path, cfg_name, d, save=False)
-    if cfg.config_file.exists(): warn(f'Config file already exists: {cfg.config_file} and will be used as a base')
-    cfg = _apply_defaults(cfg, **kwargs)
-    txt = _cfg2txt(cfg, _nbdev_cfg_head, _nbdev_cfg_sections, _nbdev_cfg_tail)
-    cfg.config_file.write_text(txt)
-    cfg_fn = Path(path)/cfg_name
-    print(f'{cfg_fn} created.')
+    repo = repo or inf.get('repo') or path.resolve().name
+    user = user or inf.get('user', '')
+    if not user: raise ValueError("Could not infer `user` from git. Please pass --user explicitly.")
+    author = author or inf.get('author', '')
+    if not author: raise ValueError("Could not infer `author` from git. Please pass --author explicitly.")
+    author_email = author_email or inf.get('author_email', '')
+    if not author_email: raise ValueError("Could not infer `author_email` from git. Please pass --author_email explicitly.")
+    branch = branch or inf.get('branch', 'main')
+    description = description or inf.get('description', '')
+    
+    lib_path = repo.replace('-', '_')
+    git_url = f"https://github.com/{user}/{repo}" if user else ''
+    doc_url = f"https://{user}.github.io/{repo}/" if user else ''
+    keywords = inf.get('keywords', 'nbdev').split()
+    
+    txt = pyproject_tmpl.format(name=repo, lib_path=lib_path, description=description, min_python=min_python, license=license,
+        author=author, author_email=author_email, keywords=keywords, git_url=git_url, doc_url=doc_url, branch=branch)
+    
+    cfg_file = path / pyproject_nm
+    if cfg_file.exists(): warn(f'{cfg_file} already exists')
+    else:
+        cfg_file.write_text(txt)
+        print(f'{cfg_file} created.')
 
 # %% ../nbs/api/01_config.ipynb #0e56064f
-def _nbdev_config_file(cfg_name=_nbdev_cfg_name, path=None):
-    cfg_path = Path.cwd() if path is None else Path(path)
-    return getattr(Config.find(cfg_name), 'config_file', cfg_path/cfg_name)
-
-# %% ../nbs/api/01_config.ipynb #f8813a52
-def _xdg_config_paths(cfg_name=_nbdev_cfg_name):
-    xdg_config_paths = reversed([xdg_config_home()]+xdg_config_dirs())
-    return [o/_nbdev_home_dir/cfg_name for o in xdg_config_paths]
+def _load_toml(p):
+    "Load TOML file at `p` into a dict"
+    return tomllib.loads(Path(p).read_text(encoding='utf-8'))
+
+def _has_nbdev(p):
+    "True if pyproject.toml at `p` has [tool.nbdev]"
+    try: return bool(_load_toml(p).get('tool', {}).get('nbdev', {}))
+    except Exception: return False
+
+def _find_nbdev_pyproject(path=None):
+    "Find nearest pyproject.toml containing [tool.nbdev], walking up from `path`"
+    p = Path(path or Path.cwd()).resolve()
+    for d in [p] + list(p.parents):
+        f = d/pyproject_nm
+        if f.exists() and _has_nbdev(f): return f
 
 # %% ../nbs/api/01_config.ipynb #3dac70e0
-def _type(t): return bool if t==bool_arg else t
-_types = {k:_type(v['anno']) for k,v in docments(_apply_defaults,full=True,returns=False).items() if k != 'cfg'}
-
-@functools.lru_cache(maxsize=None)
-def get_config(cfg_name=_nbdev_cfg_name, path=None):
+nbdev_defaults = dict(nbs_path='nbs', doc_path='_docs', tst_flags='notest', recursive=True, readme_nb='index.ipynb',
+    clean_ids=True, clear_all=False, put_version_in_init=True, jupyter_hooks=False, black_formatting=False, branch='main')
+
+_path_keys = 'lib_path', 'nbs_path', 'doc_path'
+
+# %% ../nbs/api/01_config.ipynb #165ff301
+class ConfigToml(AttrDict):
+    def __init__(self, d, proj, cfg_file):
+        super().__init__({**nbdev_defaults, **d})
+        self.config_file = cfg_file
+        self.config_path = cfg_file.parent
+        
+        self.lib_name = proj.get('name', '')
+        self.title = self.get('title') or self.lib_name
+        self.description = proj.get('description', '')
+        self.keywords = proj.get('keywords', [])
+        self.min_python = (proj.get('requires-python') or '>=3.9').lstrip('>=')
+        auths = proj.get('authors') or [{}]
+        self.author = auths[0].get('name')
+        self.author_email = auths[0].get('email')
+        
+        
+        urls = proj.get('urls') or {}
+        self.git_url = (urls.get('Repository') or urls.get('Source') or '').rstrip('/')
+        self.doc_url = urls.get('Documentation') or ''
+        self.user, self.repo = repo_details(self.git_url) if self.git_url else ('', '')
+        # Derive doc_host and doc_baseurl from doc_url
+        from urllib.parse import urlparse
+        u = urlparse(self.doc_url)
+        self.doc_host = f"{u.scheme}://{u.netloc}" if u.scheme else ''
+        self.doc_baseurl = (u.path or '/').rstrip('/') or '/'
+        if 'lib_path' not in self: self['lib_path'] = self.lib_name.replace('-', '_')
+
+    @property
+    def version(self):
+        return read_version(self.config_path / self['lib_path']) or '0.0.1'
+
+    @property
+    def d(self): return {k:v for k,v in super().items()}
+
+    def __getattr__(self, k): return stop(AttributeError(k)) if k=='d' or k not in self.d else self.get(k)
+    def __getitem__(self, k): return stop(IndexError(k)) if k not in self.d else self.get(k)
+
+    def get(self, k, default=None):
+        v = self.d.get(k, default)
+        if v is None: return None
+        return self.config_path / v if k in _path_keys else v
+
+    def path(self, k, default=None):
+        v = self.d.get(k, default)
+        return v if v is None else self.config_path / v
+
+# %% ../nbs/api/01_config.ipynb #6fed9c91
+def _user_config():
+    "Load user config from ~/.config/nbdev/config.toml if it exists"
+    p = xdg_config_home() / _nbdev_home_dir / _user_cfg_name
+    if p.exists(): return _load_toml(p)
+    return {}
+
+# %% ../nbs/api/01_config.ipynb #f6660849
+def get_config(path=None, also_settings=False):
     "Return nbdev config."
-    cfg_file = _nbdev_config_file(cfg_name, path)
-    extra_files = _xdg_config_paths(cfg_name)
-    cfg = Config(cfg_file.parent, cfg_file.name, extra_files=extra_files, types=_types)
-    return _apply_defaults(cfg)
-
-# %% ../nbs/api/01_config.ipynb #9c5b3681
-def config_key(c, default=None, path=True, missing_ok=None):
-    "Deprecated: use `get_config().get` or `get_config().path` instead."
-    warn("`config_key` is deprecated. Use `get_config().get` or `get_config().path` instead.", DeprecationWarning)
-    return get_config().path(c, default) if path else get_config().get(c, default)
+    cfg_file = _find_nbdev_pyproject(path)
+    if cfg_file is not None:
+        # Check for old settings.ini and complain loudly
+        old_cfg = cfg_file.parent / 'settings.ini'
+        if old_cfg.exists() and not also_settings:
+            raise ValueError(f"Found old settings.ini at {old_cfg}. Please migrate to pyproject.toml using `nbdev_migrate`. See https://nbdev.fast.ai/getting_started.html for details.")
+        d = _load_toml(cfg_file)
+        user = _user_config()
+        nbdev = {**user, **d.get('tool', {}).get('nbdev', {})}
+        return ConfigToml(nbdev, d.get('project', {}), cfg_file)
+    if also_settings:
+        from fastcore.foundation import Config
+        cfg = Config.find('settings.ini', path)
+        if cfg: return cfg
+    cfg_path = Path(path or Path.cwd()).expanduser().absolute()
+    return ConfigToml(nbdev_defaults, {}, cfg_path/'pyproject.toml')
 
 # %% ../nbs/api/01_config.ipynb #6939b40e
-def is_nbdev(): return _nbdev_config_file().exists()
+def is_nbdev(path=None): return _find_nbdev_pyproject(path) is not None
 
 # %% ../nbs/api/01_config.ipynb #6e89fe6c
 def create_output(txt, mime):
     "Add a cell output containing `txt` of the `mime` text MIME sub-type"
-    return [{"data": { f"text/{mime}": str(txt).splitlines(True) },
-             "execution_count": 1, "metadata": {}, "output_type": "execute_result"}]
+    return [dict(data={f"text/{mime}": str(txt).splitlines(True)},
+                 execution_count=1, metadata={}, output_type="execute_result")]
 
 # %% ../nbs/api/01_config.ipynb #5a4d8e52
 def show_src(src, lang='python'): return Markdown(f'```{lang}\n{src}\n```')
@@ -229,30 +262,57 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "FILL_IN"
 requires-python="FILL_IN"
-dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
+dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme",
+    "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
 
 [tool.uv]
-cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]
+cache-keys = [{ file = "pyproject.toml" }, { file = "setup.py" }]
 """
 
 # %% ../nbs/api/01_config.ipynb #f1c85f45
-_re_version = re.compile(r'^__version__\s*=.*$', re.MULTILINE)
+_re_version = re.compile(r'^__version__\s*=\s*[\'"]([^\'"]+)[\'"]', re.MULTILINE)
 _re_proj = re.compile(r'^name\s*=\s*".*$', re.MULTILINE)
 _re_reqpy = re.compile(r'^requires-python\s*=\s*".*$', re.MULTILINE)
 _init = '__init__.py'
 _pyproj = 'pyproject.toml'
 
-def update_version(path=None):
-    "Add or update `__version__` in the main `__init__.py` of the library."
-    path = Path(path or get_config().lib_path)
+# %% ../nbs/api/01_config.ipynb #680e62a5
+def read_version(path):
+    "Read __version__ from `path/__init__.py`, or None if not found"
+    fname = Path(path)/_init
+    if not fname.exists(): return None
+    m = _re_version.search(fname.read_text())
+    return m.group(1) if m else None
+
+# %% ../nbs/api/01_config.ipynb #cf0fc6a3
+def set_version(path, version):
+    "Set __version__ in `path/__init__.py`"
+    path = Path(path)
+    path.mkdir(exist_ok=True, parents=True)
     fname = path/_init
     if not fname.exists(): fname.touch()
-    version = f'__version__ = "{get_config().version}"'
+    ver_line = f'__version__ = "{version}"'
     code = fname.read_text()
-    if _re_version.search(code) is None: code = version + "\n" + code
-    else: code = _re_version.sub(version, code)
+    if _re_version.search(code) is None: code = ver_line + "\n" + code
+    else: code = _re_version.sub(ver_line, code)
     fname.write_text(code)
 
+# %% ../nbs/api/01_config.ipynb #d00889e5
+def bump_version(v, part=2, unbump=False):
+    "Bump semver string `v` at index `part` (0=major, 1=minor, 2=patch)"
+    parts = (v or '0.0.0').split('.')
+    parts += ['0'] * (3 - len(parts))
+    parts[part] = str(int(parts[part]) + (-1 if unbump else 1))
+    for i in range(part+1, 3): parts[i] = '0'
+    return '.'.join(parts[:3])
+
+# %% ../nbs/api/01_config.ipynb #e32583e6
+def update_version(path=None):
+    "Add __version__ to `path/__init__.py` if it doesn't exist"
+    path = Path(path or get_config().lib_path)
+    if read_version(path) is None: set_version(path, get_config().version)
+
+# %% ../nbs/api/01_config.ipynb #275ef862
 def _has_py(fs): return any(1 for f in fs if f.endswith('.py'))
 
 def update_proj(path):
@@ -260,10 +320,11 @@ def update_proj(path):
     fname = path/_pyproj
     if not fname.exists(): fname.write_text(pyproj_tmpl)
     txt = fname.read_text()
-    txt = _re_proj.sub(f'name="{get_config().lib_name}"', txt)
-    txt = _re_reqpy.sub(f'requires-python=">={get_config().min_python}"', txt)
+    txt = _re_proj.sub(f'name = "{get_config().lib_name}"', txt)
+    txt = _re_reqpy.sub(f'requires-python = ">={get_config().min_python}"', txt)
     fname.write_text(txt)
 
+# %% ../nbs/api/01_config.ipynb #bdf57184
 def add_init(path=None):
     "Add `__init__.py` in all subdirs of `path` containing python files if it's not there already."
     # we add the lowest-level `__init__.py` files first, which ensures _has_py succeeds for parent modules

nbdev/doclinks.py

@@ -107,8 +107,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     with contextlib.suppress(FileNotFoundError): idxfile.unlink()
     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')}
+    res['settings'] = {k:v for k,v in get_config().d.items() if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}
     code_root = dest.parent.resolve()
     for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re=r"\.ipynb_checkpoints"):
         try: res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
@@ -229,12 +228,12 @@ _re_backticks = re.compile(r'`([^`\s]+?)(?:\(\))?`')
 # %% ../nbs/api/05_doclinks.ipynb #3a24b883
 @lru_cache(None)
 def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
-    cfg = get_config()
+    cfg = get_config(also_settings=True)
     if strip_libs is None:
-        try: strip_libs = cfg.get('strip_libs', cfg.get('lib_path', 'nbdev').name).split()
+        try: strip_libs = cfg.get('strip_libs') or cfg.lib_name
         except FileNotFoundError: strip_libs = 'nbdev'
     skip_mods = setify(skip_mods)
-    strip_libs = L(strip_libs)
+    strip_libs = L(strip_libs.split() if isinstance(strip_libs, str) else strip_libs)
     if incl_libs is not None: incl_libs = (L(incl_libs)+strip_libs).unique()
     entries = {}
     try: eps = entry_points(group='nbdev')

nbdev/export.py

@@ -35,10 +35,9 @@ class ExportModuleProc:
 
 # %% ../nbs/api/04_export.ipynb #6f524839
 def black_format(cell, # Cell to format
-                 force=False): # Turn black formatting on regardless of settings.ini
+                 force=False): # Turn black formatting on regardless of pyproject.toml
     "Processor to format code with `black`"
-    try: cfg = get_config()
-    except FileNotFoundError: return
+    cfg = get_config()
     if (not cfg.black_formatting and not force) or cell.cell_type != 'code': return
     try: import black
     except: raise ImportError("You must install black: `pip install black` if you wish to use black formatting with nbdev")
@@ -53,8 +52,7 @@ _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
+    cfg = get_config()
     if cell.cell_type != 'code': return
     try: cell.source = _magics_pattern.sub('', cell.source)
     except: pass

nbdev/migrate.py

@@ -3,14 +3,14 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/16_migrate.ipynb.
 
 # %% auto #0
-__all__ = ['MigrateProc', 'fp_md_fm', 'migrate_nb', 'migrate_md', 'nbdev_migrate']
+__all__ = ['MigrateProc', 'fp_md_fm', 'migrate_nb', 'migrate_md', 'nbdev_migrate', 'nbdev_migrate_config']
 
 # %% ../nbs/api/16_migrate.ipynb #5b687fa0-dc50-48df-8bfc-e98df34e7572
 from .process import *
 from .frontmatter import *
 from .frontmatter import _fm2dict, _re_fm_md, _dict2fm, _insertfm
 from .processors import *
-from .config import get_config, read_nb
+from .config import get_config, read_nb, set_version, pyproject_tmpl, nbdev_defaults
 from .sync import write_nb
 from .showdoc import show_doc
 from fastcore.all import *
@@ -179,3 +179,97 @@ def nbdev_migrate(
             if f.name.endswith('.ipynb'): migrate_nb(f)
             if f.name.endswith('.md'): migrate_md(f)
         except Exception as e: raise Exception(f'Error in migrating file: {f}') from e
+
+# %% ../nbs/api/16_migrate.ipynb #ad76e503
+_license_map = {'apache2': 'Apache-2.0', 'mit': 'MIT', 'gpl2': 'GPL-2.0', 'gpl3': 'GPL-3.0', 'bsd3': 'BSD-3-Clause'}
+
+# %% ../nbs/api/16_migrate.ipynb #7647b587
+def _migrate_workflows(path):
+    "Update GitHub workflow files to use nbdev3 workflows"
+    wf_path = Path(path) / '.github/workflows'
+    if not wf_path.exists(): return
+    replacements = [
+        ('fastai/workflows/quarto-ghp@', 'fastai/workflows/quarto-ghp3@'),
+        ('fastai/workflows/nbdev-ci@', 'fastai/workflows/nbdev-ci3@'),
+    ]
+    for f in wf_path.glob('*.yml'):
+        txt = f.read_text()
+        for old, new in replacements: txt = txt.replace(old, new)
+        f.write_text(txt)
+
+# %% ../nbs/api/16_migrate.ipynb #1ca2d1b3
+def _toml_val(v):
+    if v.lower() in ('true','false'): return v.lower()
+    return repr(v)
+def _py_val(v):
+    try: return str2bool(v)
+    except: return v
+
+
+def _fmt_script(s):
+    name,val = s.strip().split('=')
+    return f'{name.strip()} = "{val.strip()}"'
+
+
+def _build_classifiers(d):
+    "Build list of classifier strings from config dict"
+    _status_map = {'1': 'Planning', '2': 'Pre-Alpha', '3': 'Alpha', '4': 'Beta', '5': 'Production/Stable', '6': 'Mature', '7': 'Inactive'}
+    cs = ['Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only']
+    status,audience,language = d.get('status', '').strip(), d.get('audience', '').strip(), d.get('language', '').strip()
+    if status and status in _status_map: cs.insert(0, f"Development Status :: {status} - {_status_map[status]}")
+    if audience: cs.insert(0, f"Intended Audience :: {audience}")
+    if language: cs.insert(0, f"Natural Language :: {language}")
+    return cs
+
+# %% ../nbs/api/16_migrate.ipynb #796a2c4b
+def _nbdev_migrate_config(d, path):  # Config dict from settings.ini
+    "Migrate settings.ini dict to pyproject.toml string"
+    repo = d.get('repo', '')
+    user = d.get('user', '')
+    lib_path = d.get('lib_path', repo.replace('-', '_'))
+    branch = d.get('branch', 'main')
+    
+    git_url = d.get('git_url') or (f"https://github.com/{user}/{repo}" if user else '')
+    doc_host = d.get('doc_host', '')
+    doc_baseurl = d.get('doc_baseurl', '')
+    doc_url = (doc_host.rstrip('/') + doc_baseurl) if doc_host else (f"https://{user}.github.io/{repo}/" if user else '')
+    set_version(path/lib_path, d.get('version', '0.0.1'))
+    lib_name = d.get('lib_name', repo)
+    txt = pyproject_tmpl.format(name=lib_name, lib_path=lib_path, description=d.get('description', ''),
+        min_python=d.get('min_python', '3.10'), license=_license_map.get(d.get('license', ''), d.get('license', 'Apache-2.0')),
+        author=d.get('author', ''), author_email=d.get('author_email', ''),
+        keywords=d.get('keywords', 'nbdev').split(), git_url=git_url, doc_url=doc_url, branch=branch)
+    # Add dependencies (combine requirements + pip_requirements)
+    reqs = d.get('requirements', '').split() + d.get('pip_requirements', '').split()
+    if reqs: txt = txt.replace('dependencies = []', f'dependencies = {reqs}')
+    dev_reqs = d.get('dev_requirements', '').split()
+    if dev_reqs: txt = txt.replace('[tool.setuptools', f'[project.optional-dependencies]\ndev = {dev_reqs}\n\n[tool.setuptools', 1)
+    # Add console_scripts
+    scripts = d.get('console_scripts', '').strip()
+    if scripts:
+        scripts_lines = [_fmt_script(s) for s in scripts.split('\n') if s.strip()]
+        scripts_toml = '\n[project.scripts]\n' + '\n'.join(scripts_lines)
+        txt = txt.replace('[tool.setuptools', scripts_toml + '\n\n[tool.setuptools', 1)
+    _classifiers_default = 'classifiers = [\n    "Programming Language :: Python :: 3",\n    "Programming Language :: Python :: 3 :: Only",\n]'
+    txt = txt.replace(_classifiers_default, 'classifiers = ' + repr(_build_classifiers(d)).replace("'", '"'))
+    
+    nbdev_settings = {k:d[k] for k in ('nbs_path','doc_path','branch','recursive','readme_nb','tst_flags',
+        'clean_ids','clear_all','put_version_in_init','jupyter_hooks','custom_sidebar','title')
+        if k in d and _py_val(d[k]) != nbdev_defaults.get(k) and not (k=='title' and d[k]==repo)}
+    if nbdev_settings:
+        nbdev_toml = '\n'.join(f'{k} = {_toml_val(v)}' for k,v in nbdev_settings.items())
+        txt = txt.rstrip() + '\n' + nbdev_toml + '\n'
+    _migrate_workflows(path)
+    return txt
+
+# %% ../nbs/api/16_migrate.ipynb #a9534478
+@call_parse
+def nbdev_migrate_config(path:str='.'):  # Project root containing settings.ini
+    "Migrate settings.ini to pyproject.toml"
+    path = Path(path)
+    ini = path/'settings.ini'
+    if not ini.exists(): return print(f"No settings.ini found at {ini}")
+    cfg = Config(path, 'settings.ini')
+    txt = _nbdev_migrate_config(cfg.d, path)
+    (path/'pyproject.toml').write_text(txt)
+    print(f"Created {path/'pyproject.toml'}. You can now delete {ini} and setup.py (if present)")

nbdev/quarto.py

@@ -110,7 +110,7 @@ class IndentDumper(yaml.Dumper):
 def nbdev_sidebar(
     path:str=None, # Path to notebooks
     printit:bool=False,  # Print YAML for debugging
-    force:bool=False,  # Create sidebar even if settings.ini custom_sidebar=False
+    force:bool=False,  # Create sidebar even if custom_sidebar=false in pyproject.toml
     skip_folder_re:str=r'(?:^[_.]|^www\$)', # Skip folders matching regex
     **kwargs):
     "Create sidebar.yml"
@@ -177,7 +177,7 @@ website:
 
 # %% ../nbs/api/14_quarto.ipynb #38124450
 def refresh_quarto_yml():
-    "Generate `_quarto.yml` from `settings.ini`."
+    "Generate `_quarto.yml` from `pyproject.toml`."
     cfg = get_config()
     ny = cfg.nbs_path/'nbdev.yml'
     vals = {k:cfg[k] for k in ['title', 'description', 'branch', 'git_url', 'doc_host', 'doc_baseurl']}
@@ -185,7 +185,7 @@ def refresh_quarto_yml():
     if 'title' not in vals: vals['title'] = vals['lib_name']
     ny.write_text(_nbdev_yml.format(**vals))
     qy = cfg.nbs_path/'_quarto.yml'
-    if 'custom_quarto_yml' in cfg.d: print("NB: `_quarto.yml` is no longer auto-updated. Remove `custom_quarto_yml` from `settings.ini`")
+    if 'custom_quarto_yml' in cfg: print("NB: `_quarto.yml` is no longer auto-updated. Remove `custom_quarto_yml` from `pyproject.toml`")
     if qy.exists() and not str2bool(cfg.get('custom_quarto_yml', True)): qy.unlink()
     if not qy.exists(): qy.write_text(_quarto_yml)
 

nbdev/release.py

@@ -5,8 +5,7 @@
 # %% auto #0
 __all__ = ['GH_HOST', 'CONDA_WARNING', 'Release', 'changelog', 'push_release', 'release_git', 'release_gh', 'pypi_json',
            'latest_pypi', 'pypi_details', 'conda_output_path', 'write_conda_meta', 'write_requirements',
-           'anaconda_upload', 'release_conda', 'chk_conda_rel', 'release_pypi', 'release_both', 'bump_version',
-           'nbdev_bump_version']
+           'anaconda_upload', 'release_conda', 'chk_conda_rel', 'release_pypi', 'release_both', 'nbdev_bump_version']
 
 # %% ../nbs/api/18_release.ipynb #c35cc2b8
 from fastcore.all import *
@@ -22,10 +21,7 @@ from .doclinks import *
 GH_HOST = "https://api.github.com"
 
 # %% ../nbs/api/18_release.ipynb #e220cefa
-def _find_config(cfg_name="settings.ini"):
-    cfg_path = Path().absolute()
-    while cfg_path != cfg_path.parent and not (cfg_path/cfg_name).exists(): cfg_path = cfg_path.parent
-    return Config(cfg_path, cfg_name)
+def _find_config(): return get_config()
 
 # %% ../nbs/api/18_release.ipynb #1972609a
 def _issue_txt(issue):
@@ -109,7 +105,7 @@ def latest_notes(self:Release):
 @call_parse
 def changelog(
     debug:store_true=False,  # Print info to be added to CHANGELOG, instead of updating file
-    repo:str=None,  # repo to use instead of `lib_name` from `settings.ini`
+    repo:str=None,  # repo to use instead of `lib_name` from pyproject.toml
 ):
     "Create a CHANGELOG.md file from closed and labeled GitHub issues"
     res = Release(repo=repo).changelog(debug=debug)
@@ -211,8 +207,8 @@ def _get_conda_meta():
 
     hostreqs = ['packaging', f'python >={cfg.min_python}']
     reqs = hostreqs+[]
-    if cfg.get('requirements'): reqs += cfg.requirements.split()
-    if cfg.get('conda_requirements'): reqs += cfg.conda_requirements.split()
+    if cfg.get('requirements'): reqs += cfg.requirements
+    if cfg.get('conda_requirements'): reqs += cfg.conda_requirements
 
     pypi = pypi_json(f'{name}/{ver}')
     rel = [o for o in pypi['urls'] if o['packagetype']=='sdist'][0]
@@ -250,10 +246,10 @@ def write_conda_meta(path='conda'):
 # %% ../nbs/api/18_release.ipynb #7550557f
 @call_parse
 def write_requirements(path:str=''):
-    "Writes a `requirements.txt` file to `directory` based on settings.ini."
+    "Writes a `requirements.txt` file to `directory` based on pyproject.toml."
     cfg = get_config()
     d = Path(path) if path else cfg.config_path
-    req = '\n'.join([cfg.get(k, '').replace(' ', '\n') for k in ['requirements', 'pip_requirements']])
+    req = '\n'.join(['\n'.join(cfg.get(k) or []) for k in ['requirements', 'pip_requirements']])
     (d/'requirements.txt').mk_write(req)
 
 # %% ../nbs/api/18_release.ipynb #715ae3ac
@@ -297,7 +293,7 @@ def release_conda(
     loc = outs[0]
     if skip_upload: return print(loc)
     if not upload_user: upload_user = get_config().conda_user
-    if not upload_user: return print("`conda_user` not in settings.ini and no `upload_user` passed. Cannot upload")
+    if not upload_user: return print("`conda_user` not in pyproject.toml and no `upload_user` passed. Cannot upload")
     if 'anaconda upload' not in res: return print(f"{res}\n\nFailed. Check auto-upload not set in .condarc. Try `--do_build False`.")
     return anaconda_upload(name, loc)
 
@@ -344,24 +340,16 @@ def release_both(
     release_conda.__wrapped__(path, do_build=do_build, build_args=build_args, skip_upload=skip_upload, mambabuild=mambabuild, upload_user=upload_user)
     nbdev_bump_version.__wrapped__()
 
-# %% ../nbs/api/18_release.ipynb #6380dd5a
-def bump_version(version, part=2, unbump=False):
-    version = version.split('.')
-    incr = -1 if unbump else 1
-    version[part] = str(int(version[part]) + incr)
-    for i in range(part+1, 3): version[i] = '0'
-    return '.'.join(version)
-
 # %% ../nbs/api/18_release.ipynb #c0f64b2c
 @call_parse
 def nbdev_bump_version(
     part:int=2,  # Part of version to bump
     unbump:bool=False):  # Reduce version instead of increasing it
-    "Increment version in settings.ini by one"
+    "Increment version in __init__.py by one"
     cfg = get_config()
-    print(f'Old version: {cfg.version}')
-    cfg.d['version'] = bump_version(get_config().version, part, unbump=unbump)
-    cfg.save()
-    update_version()
+    old_ver = read_version(cfg.lib_path)
+    print(f'Old version: {old_ver}')
+    new_ver = bump_version(old_ver, part, unbump=unbump)
+    set_version(cfg.lib_path, new_ver)
     nbdev_export.__wrapped__()
-    print(f'New version: {cfg.version}')
+    print(f'New version: {new_ver}')

nbdev/serve.py

@@ -36,7 +36,7 @@ def _is_qpy(path:Path):
 
 # %% ../nbs/api/17_serve.ipynb #abc3835a
 def _proc_file(s, cache, path, mtime=None):
-    skips = ('_proc', '_docs', '_site', 'settings.ini')
+    skips = ('_proc', '_docs', '_site', 'pyproject.toml')
     if not s.is_file() or any(o[0]=='.' or o in skips for o in s.parts): return
     d = cache/s.relative_to(path)
     if s.suffix=='.py': d = d.with_suffix('')
@@ -69,7 +69,7 @@ def proc_nbs(
     if (path/'_brand.yml').exists(): files.append(path/'_brand.yml')
     if (path/'_extensions').exists(): files.extend(nbglob(path/'_extensions', func=Path, file_glob='', file_re='', skip_file_re='^[.]'))
 
-    # If settings.ini or filter script newer than cache folder modified, delete cache
+    # If pyproject.toml or filter script newer than cache folder modified, delete cache
     chk_mtime = max(cfg.config_file.stat().st_mtime, Path(__file__).stat().st_mtime)
     cache.mkdir(parents=True, exist_ok=True)
     cache_mtime = cache.stat().st_mtime

nbdev/test.py

@@ -78,7 +78,7 @@ def nbdev_test(
     ignore_fname:str='.notest', # Filename that will result in siblings being ignored
     **kwargs):
     "Test in parallel notebooks matching `path`, passing along `flags`"
-    skip_flags = get_config().tst_flags.split()
+    skip_flags = get_config().tst_flags
     force_flags = flags.split()
     files = nbglob(path, as_path=True, **kwargs)
     files = [f.absolute() for f in sorted(files) if _keep_file(f, ignore_fname)]
@@ -86,7 +86,7 @@ def nbdev_test(
 
     if n_workers is None: n_workers = 0 if len(files)==1 else min(num_cpus(), 8)
     if IN_NOTEBOOK: kw = {'method':'spawn'} if os.name=='nt' else {'method':'forkserver'}
-    else: kw = {}
+    else: kw = {'method':'forkserver'} if sys.platform=='darwin' else {}
     wd_pth = get_config().nbs_path
     with working_directory(wd_pth if (wd_pth and wd_pth.exists()) else os.getcwd()):
         results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,

{nbdev-2.4.14.dist-info → nbdev-3.0.1.dist-info}/METADATA

@@ -1,25 +1,21 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 2.4.14
+Version: 3.0.1
 Summary: Create delightful software with Jupyter Notebooks
-Home-page: https://github.com/AnswerDotAI/nbdev
-Author: Jeremy Howard and Hamel Husain
-Author-email: j@fast.ai
-License: Apache Software License 2.0
+Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
+License: Apache-2.0
+Project-URL: Repository, https://github.com/AnswerDotAI/nbdev
 Project-URL: Documentation, https://nbdev.fast.ai/
-Keywords: nbdev fastai jupyter notebook export
+Keywords: nbdev,fastai,jupyter,notebook,export
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: packaging
 Requires-Dist: fastcore>=1.12.3
 Requires-Dist: execnb>=0.1.12
 Requires-Dist: astunparse
@@ -29,7 +25,8 @@ Requires-Dist: asttokens
 Requires-Dist: setuptools
 Requires-Dist: build
 Requires-Dist: fastgit
-Requires-Dist: PyYAML
+Requires-Dist: pyyaml
+Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: ipywidgets; extra == "dev"
 Requires-Dist: nbdev-numpy; extra == "dev"
@@ -43,20 +40,7 @@ Requires-Dist: pysymbol_llm; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: plum-dispatch; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # Getting Started
 

nbdev-3.0.1.dist-info/RECORD

@@ -0,0 +1,30 @@
+nbdev/__init__.py,sha256=fCsCqxeWeOcKROfSIXybYksblr8_iA-XWQshMYEi1tE,89
+nbdev/_modidx.py,sha256=7jB1wx0EmQtah_L-jwRW360KwP02VB-TOuK9qY2o3ZI,40082
+nbdev/clean.py,sha256=817PYPBGh0Pn-rmhzOFNVfKtaLJGkMF7Vzqb2Q5PCeI,9744
+nbdev/cli.py,sha256=ZYJdR5npjv1kbyJrsWLycgzaAES8tR41mCHhDqdoY54,7772
+nbdev/config.py,sha256=jvec2ETyZtK5VwtKhcbEu0IuX31Z01zMU38U-wr0PNI,14882
+nbdev/diff.py,sha256=8vzFbmk8jmn4LW66wXEDJVxsJTf4eegNMbBVV4jI708,3794
+nbdev/doclinks.py,sha256=oSvmFibewmC3vNOrNLNzcOU7Fv6ZaJPTcQx0h9AMWeM,12829
+nbdev/export.py,sha256=7Lg9MZXlp2YVxpODpe8EuNtDJcz7B_8U0lxEGbq1B3k,4040
+nbdev/extract_attachments.py,sha256=O4mS4EFIOXL_yQ3jmsnBStrWxGR_nPNvxLYXHtLeimw,2208
+nbdev/frontmatter.py,sha256=CdJj6B1NyodH--uOCfWhGK0vI7gnKp-i2EzKce47kQQ,2820
+nbdev/imports.py,sha256=f5Ynco14hsJyFCf43-uP_YARMhHADe6lM-20Mc_vXhw,95
+nbdev/maker.py,sha256=OG0l-L-_zzErA5boWpt-0Ozi8eZU_2SSbY_-peo13_E,10011
+nbdev/merge.py,sha256=WOjbqKwDfNK16L9P-eZ-IPUTgC1brOWg6jaKfDziDIc,4432
+nbdev/migrate.py,sha256=-GuFzUAZJivPPCI6tlQI_ZpSWCKsBFQyqkTo23p-AGI,12860
+nbdev/process.py,sha256=cSKAdQ-KDPv6UNLqii61SnmFsw8qmcY-YwBPUbwRd18,6163
+nbdev/processors.py,sha256=SL4Y4ha1ZQU-dV1nZyyb68viq0X2tE2PfBX26_LEzYY,12364
+nbdev/qmd.py,sha256=4_paV81SjRh2TmDS5tyu8Y2TW1X_yg0PYGAi6fOw3ek,3129
+nbdev/quarto.py,sha256=2uxekOFtFJ47NalegwLoZw6Jd-C3gf5BJWhHsraf2J0,14126
+nbdev/release.py,sha256=KbnwAeNer9zVCFXR6C3ZmO-Ggb8PTOMcNazzbGLDkIk,14632
+nbdev/serve.py,sha256=UQD30QsO3KFhN95kcLTwXyXcg6GrrpFP8Ek5OCcKIRs,3191
+nbdev/serve_drv.py,sha256=IZ2acem_KKsXYYe0iUECiR_orkYLBkT1ZG_258ZS7SQ,657
+nbdev/showdoc.py,sha256=rgVpHGVQi14RBdLYnh3ukPPG9EEKGyTMW_zGAH7HM7o,2657
+nbdev/sync.py,sha256=eMYZYzu3RMDWjY-apr2TyzB7cTEB9v5-svF_Z--xyj8,3391
+nbdev/test.py,sha256=KBJL4dJjxaGGqKqaQONnLP-ugX79RV4B0TDUG3MnHnw,4579
+nbdev-3.0.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nbdev-3.0.1.dist-info/METADATA,sha256=6h4MoGSUt6IT7F1cINGMt1T6hkLNSmgY1nq3dhUAM1M,10475
+nbdev-3.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nbdev-3.0.1.dist-info/entry_points.txt,sha256=N55SDYwtagnT3kgSUdZigVdm5yp_mYgLZzd0GelV23s,1511
+nbdev-3.0.1.dist-info/top_level.txt,sha256=3cWYLMuaXsZjz3TQRGEkWGs9Z8ieEDmYcq8TZS3y3vU,6
+nbdev-3.0.1.dist-info/RECORD,,

{nbdev-2.4.14.dist-info → nbdev-3.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{nbdev-2.4.14.dist-info → nbdev-3.0.1.dist-info}/entry_points.txt

@@ -16,6 +16,7 @@ nbdev_install_hooks = nbdev.clean:nbdev_install_hooks
 nbdev_install_quarto = nbdev.quarto:install_quarto
 nbdev_merge = nbdev.merge:nbdev_merge
 nbdev_migrate = nbdev.migrate:nbdev_migrate
+nbdev_migrate_config = nbdev.migrate:nbdev_migrate_config
 nbdev_new = nbdev.cli:nbdev_new
 nbdev_prepare = nbdev.quarto:prepare
 nbdev_preview = nbdev.quarto:nbdev_preview

nbdev-2.4.14.dist-info/RECORD

@@ -1,30 +0,0 @@
-nbdev/__init__.py,sha256=zJpD-99JRntw637921eGhSPcki1g8j7Ugz-MUxnPi-8,90
-nbdev/_modidx.py,sha256=9Ha0XafZNcnsUIju5aJx7GVqkgwX35vVGanoCgfbN-s,38372
-nbdev/clean.py,sha256=rTLJsz_gNqd9TdTBLmEuexXN6lZPCq6PVS_Xd4JGMZ0,9748
-nbdev/cli.py,sha256=csOPIFIz8fouyjTx-OX_0it1Fts-Z_c72dnIOxXxGDc,7588
-nbdev/config.py,sha256=01DWLwkfdsn7TkYklO52LagvzI8UenfEga1GwyAxc-o,13760
-nbdev/diff.py,sha256=8vzFbmk8jmn4LW66wXEDJVxsJTf4eegNMbBVV4jI708,3794
-nbdev/doclinks.py,sha256=_t7frF7hdboJLJmYoPfjOiSvkSBtTKlh4AcjyTeD3XQ,12806
-nbdev/export.py,sha256=CVJGQ8suzO2LZHqVCzJKjmoR42R5yTRWA76KY1sWnQA,4122
-nbdev/extract_attachments.py,sha256=O4mS4EFIOXL_yQ3jmsnBStrWxGR_nPNvxLYXHtLeimw,2208
-nbdev/frontmatter.py,sha256=CdJj6B1NyodH--uOCfWhGK0vI7gnKp-i2EzKce47kQQ,2820
-nbdev/imports.py,sha256=f5Ynco14hsJyFCf43-uP_YARMhHADe6lM-20Mc_vXhw,95
-nbdev/maker.py,sha256=OG0l-L-_zzErA5boWpt-0Ozi8eZU_2SSbY_-peo13_E,10011
-nbdev/merge.py,sha256=WOjbqKwDfNK16L9P-eZ-IPUTgC1brOWg6jaKfDziDIc,4432
-nbdev/migrate.py,sha256=uhmkStmHPb082VDKnAPlD2vOVUi1iYOYdKzqHwF12cc,7902
-nbdev/process.py,sha256=cSKAdQ-KDPv6UNLqii61SnmFsw8qmcY-YwBPUbwRd18,6163
-nbdev/processors.py,sha256=SL4Y4ha1ZQU-dV1nZyyb68viq0X2tE2PfBX26_LEzYY,12364
-nbdev/qmd.py,sha256=4_paV81SjRh2TmDS5tyu8Y2TW1X_yg0PYGAi6fOw3ek,3129
-nbdev/quarto.py,sha256=Hfxj_bCrm0OlKGh6S954d1E2BCfPL1q0901RRvC4bCA,14119
-nbdev/release.py,sha256=8PuCYqLb2XpPyrCPo70fVWIRlua_kbRWUtEJH68Cics,15126
-nbdev/serve.py,sha256=XqTB9Mjgs_X3U5VNJ-vPbx2rs8ayBog5cfPiFumBPt4,3187
-nbdev/serve_drv.py,sha256=IZ2acem_KKsXYYe0iUECiR_orkYLBkT1ZG_258ZS7SQ,657
-nbdev/showdoc.py,sha256=rgVpHGVQi14RBdLYnh3ukPPG9EEKGyTMW_zGAH7HM7o,2657
-nbdev/sync.py,sha256=eMYZYzu3RMDWjY-apr2TyzB7cTEB9v5-svF_Z--xyj8,3391
-nbdev/test.py,sha256=74rkaOEY4KOeosB84V3DYvUsv-klVDdubuw_SWL7-vo,4532
-nbdev-2.4.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nbdev-2.4.14.dist-info/METADATA,sha256=inKYYMmfF-Myy0ELMNLm80NJRYR0JIFTvmpccXX60CQ,10829
-nbdev-2.4.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nbdev-2.4.14.dist-info/entry_points.txt,sha256=1ADLbIIJxZeLgOD8NpizkPULSsd_fgUQxwAkbGk45b8,1453
-nbdev-2.4.14.dist-info/top_level.txt,sha256=3cWYLMuaXsZjz3TQRGEkWGs9Z8ieEDmYcq8TZS3y3vU,6
-nbdev-2.4.14.dist-info/RECORD,,