remove obsolete Config.path usages

Author: jph00

nbdev/clean.py

@@ -31,7 +31,7 @@ def nbdev_trust(
         warnings.warn("Please install jupyter and try again")
         return
 
-    fname = Path(fname if fname else get_config().path('nbs_path'))
+    fname = Path(fname if fname else get_config().nbs_path)
     path = fname if fname.is_dir() else fname.parent
     check_fname = path/".last_checked"
     last_checked = os.path.getmtime(check_fname) if check_fname.exists() else None
@@ -133,7 +133,7 @@ def nbdev_clean(
     _write = partial(process_write, warn_msg='Failed to clean notebook', proc_nb=_clean)
     if stdin: return _write(f_in=sys.stdin, f_out=sys.stdout)
 
-    if fname is None: fname = get_config().path('nbs_path')
+    if fname is None: fname = get_config().nbs_path
     for f in globtastic(fname, file_glob='*.ipynb', skip_folder_re='^[_.]'): _write(f_in=f, disp=disp)
 
 # %% ../nbs/09_API/10_clean.ipynb 30

nbdev/doclinks.py

@@ -71,8 +71,8 @@ def _stor(nm, tree, pre=''): d[f'{mod_name}{pre}.{nm}'] = f'{loc}#{nm.lower()}',
 # %% ../nbs/09_API/04b_doclinks.ipynb 10
 def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     "Create _modidx.py"
-    if dest is None: dest = get_config().path('lib_path')
-    nbs_path = Path(nbs_path or get_config().path('nbs_path')).resolve()
+    if dest is None: dest = get_config().lib_path
+    nbs_path = Path(nbs_path or get_config().nbs_path).resolve()
     if os.environ.get('IN_TEST',0): return
     idxfile = dest/'_modidx.py'
     if skip_exists and idxfile.exists(): return
@@ -90,7 +90,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
 @delegates(globtastic, but=('file_glob', 'skip_folder_re', 'skip_file_re'))
 def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_re='^[_.]', key='nbs_path', as_path=False, **kwargs):
     "Find all files in a directory matching an extension given a config key."
-    path = Path(path or get_config().path(key))
+    path = Path(path or get_config()[key])
     recursive=str2bool(get_config().recursive)
     res = globtastic(path, file_glob=file_glob, skip_folder_re=skip_folder_re,
                      skip_file_re=skip_file_re, recursive=recursive, **kwargs)
@@ -120,7 +120,7 @@ def nbdev_export(
     if os.environ.get('IN_TEST',0): return
     files = nbglob(path=path, **kwargs)
     for f in files: nb_export(f)
-    add_init(get_config().path('lib_path'))
+    add_init(get_config().lib_path)
     _build_modidx()
 
 # %% ../nbs/09_API/04b_doclinks.ipynb 19

nbdev/export.py

@@ -43,7 +43,7 @@ def black_format(cell, # Cell to format
 # %% ../nbs/09_API/04a_export.ipynb 9
 def nb_export(nbname, lib_path=None, procs=black_format, debug=False, mod_maker=ModuleMaker):
     "Create module(s) from notebook"
-    if lib_path is None: lib_path = get_config().path('lib_path')
+    if lib_path is None: lib_path = get_config().lib_path
     exp = ExportModuleProc()
     nb = NBProcessor(nbname, [exp]+L(procs), debug=debug)
     nb.process()

nbdev/maker.py

@@ -182,7 +182,7 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
     if all_cells is None: all_cells = cells
     cells,all_cells = L(cells),L(all_cells)
     if self.parse: 
-        if not lib_path: lib_path = get_config().path('lib_path')
+        if not lib_path: lib_path = get_config().lib_path
         mod_dir = os.path.relpath(self.fname.parent, Path(lib_path).parent)
         _import2relative(all_cells, mod_dir)
     if not self.is_new: return self._make_exists(cells, all_cells)
@@ -215,6 +215,6 @@ def _make_exists(self:ModuleMaker, cells, all_cells=None):
 # %% ../nbs/09_API/02_maker.ipynb 43
 def _basic_export_nb2(fname, name, dest=None):
     "A basic exporter to bootstrap nbdev using `ModuleMaker`"
-    if dest is None: dest = get_config().path('lib_path')
+    if dest is None: dest = get_config().lib_path
     cells = L(c for c in read_nb(fname).cells if re.match(r'#\|\s*export', c.source))
     ModuleMaker(dest=dest, name=name, nb_path=fname).make(cells)

nbdev/migrate.py

@@ -123,5 +123,5 @@ def nbdev_migrate(
     _write = partial(process_write, warn_msg='Failed to replace directives', proc_nb=_migrate)
     if stdin: _write(f_in=sys.stdin, f_out=sys.stdout)
     _skip_re = None if no_skip else '^[_.]'
-    if fname is None: fname = get_config().path('nbs_path')
+    if fname is None: fname = get_config().nbs_path
     for f in globtastic(fname, file_glob='*.ipynb', skip_folder_re=_skip_re): _write(f_in=f, disp=disp)

nbdev/quarto.py

@@ -54,15 +54,15 @@ def install_quarto():
 def install():
     "Install Quarto and the current library"
     install_quarto.__wrapped__()
-    d = get_config().path('lib_path')
+    d = get_config().lib_path
     if (d/'__init__.py').exists(): system(f'pip install -e "{d.parent}[dev]"')
 
 # %% ../nbs/09_API/13_quarto.ipynb 9
 def _doc_paths(path:str=None, doc_path:str=None):
     cfg = get_config()
     cfg_path = cfg.config_path
-    path = cfg.path('nbs_path') if not path else Path(path)
-    doc_path = cfg.path('doc_path') if not doc_path else Path(doc_path)
+    path = cfg.nbs_path if not path else Path(path)
+    doc_path = cfg.doc_path if not doc_path else Path(doc_path)
     tmp_doc_path = path/f"{cfg['doc_path']}"
     return cfg,cfg_path,path,doc_path,tmp_doc_path
 
@@ -97,7 +97,7 @@ def nbdev_sidebar(
     **kwargs):
     "Create sidebar.yml"
     if not force and str2bool(get_config().custom_sidebar): return
-    path = get_config().path('nbs_path') if not path else Path(path)
+    path = get_config().nbs_path if not path else Path(path)
     files = nbglob(path, func=_f, skip_folder_re=skip_folder_re, **kwargs).sorted(key=_sort)
     lastd,res = Path(),[]
     for dabs,name in files:
@@ -212,7 +212,7 @@ def _ensure_quarto():
 def refresh_quarto_yml():
     "Generate `_quarto.yml` from `settings.ini`."
     cfg = get_config()
-    p = cfg.path('nbs_path')/'_quarto.yml'
+    p = cfg.nbs_path/'_quarto.yml'
     vals = {k:cfg.get(k) for k in ['doc_path', 'title', 'description', 'branch', 'git_url', 'doc_host', 'doc_baseurl']}
     # Do not build _quarto_yml if custom_quarto_yml is set to True
     if str2bool(cfg.get('custom_quarto_yml', False)): return
@@ -287,4 +287,4 @@ def deploy(
     if not skip_build: nbdev_quarto.__wrapped__(path, **kwargs)
     try: from ghp_import import ghp_import
     except: return warnings.warn('Please install ghp-import with `pip install ghp-import`')
-    ghp_import(get_config().path('doc_path'), push=True, stderr=True, no_history=True)
+    ghp_import(get_config().doc_path, push=True, stderr=True, no_history=True)

nbdev/release.py

@@ -213,7 +213,7 @@ def _get_conda_meta():
         'source': {'url':rel['url'], 'sha256':rel['digests']['sha256']}
     }
 
-    _dir = cfg.path('lib_path').parent
+    _dir = cfg.lib_path.parent
     readme = _dir/'README.md'
     descr = readme.read_text() if readme.exists() else ''
     d2 = {
@@ -295,7 +295,7 @@ def release_pypi(
     repository:str="pypi" # Respository to upload to (defined in ~/.pypirc)
 ):
     "Create and upload Python package to PyPI"
-    _dir = get_config().path('lib_path').parent
+    _dir = get_config().lib_path.parent
     system(f'cd {_dir}  && rm -rf dist && python setup.py sdist bdist_wheel')
     system(f'twine upload --repository {repository} {_dir}/dist/*')
 

nbdev/showdoc.py

@@ -224,5 +224,5 @@ def colab_link(path):
     from IPython.display import Markdown
     cfg = get_config()
     pre = 'https://colab.research.google.com/github/'
-    res = f'{pre}{cfg.user}/{cfg.lib_name}/blob/{cfg.branch}/{cfg.path("nbs_path").name}/{path}.ipynb'
+    res = f'{pre}{cfg.user}/{cfg.lib_name}/blob/{cfg.branch}/{cfg.nbs_path.name}/{path}.ipynb'
     display(Markdown(f'[Open `{path}` in Colab]({res})'))

nbdev/test.py

@@ -84,7 +84,7 @@ def nbdev_test(
     if len(files)==0: return print('No files were eligible for testing')
 
     if n_workers is None: n_workers = 0 if len(files)==1 else min(num_cpus(), 8)
-    os.chdir(get_config().path('nbs_path'))
+    os.chdir(get_config().nbs_path)
     if IN_NOTEBOOK: kw = {'method':'spawn'} if os.name=='nt' else {'method':'forkserver'}
     else: kw = {}
     results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,

nbs/09_API/02_maker.ipynb

@@ -479,7 +479,7 @@
     "    if all_cells is None: all_cells = cells\n",
     "    cells,all_cells = L(cells),L(all_cells)\n",
     "    if self.parse: \n",
-    "        if not lib_path: lib_path = get_config().path('lib_path')\n",
+    "        if not lib_path: lib_path = get_config().lib_path\n",
     "        mod_dir = os.path.relpath(self.fname.parent, Path(lib_path).parent)\n",
     "        _import2relative(all_cells, mod_dir)\n",
     "    if not self.is_new: return self._make_exists(cells, all_cells)\n",
@@ -722,7 +722,7 @@
     "#|export\n",
     "def _basic_export_nb2(fname, name, dest=None):\n",
     "    \"A basic exporter to bootstrap nbdev using `ModuleMaker`\"\n",
-    "    if dest is None: dest = get_config().path('lib_path')\n",
+    "    if dest is None: dest = get_config().lib_path\n",
     "    cells = L(c for c in read_nb(fname).cells if re.match(r'#\\|\\s*export', c.source))\n",
     "    ModuleMaker(dest=dest, name=name, nb_path=fname).make(cells)"
    ]