Merge branch 'master' of github.com:fastai/nbdev

Author: jph00

nbdev/cli.py

@@ -269,6 +269,8 @@ def refresh_quarto_yml():
     cfg = get_config()
     p = cfg.path('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(config_key('custom_quarto_yml', default="False", path=False)): return
     if 'title' not in vals: vals['title'] = vals['lib_name']
     yml=_quarto_yml.format(**vals)
     p.write_text(yml)

nbdev/doclinks.py

@@ -112,12 +112,11 @@ def build_modidx():
     if os.environ.get('IN_TEST',0): return
     _fn = dest/'_modidx.py'
     nbs_path = config_key('nbs_path')
-    files = globtastic(nbs_path)
     with contextlib.suppress(FileNotFoundError): _fn.unlink()
     cfg = get_config()
     doc_func = partial(_doc_link, urljoin(cfg.doc_host,cfg.doc_baseurl))
-    for file in dest.glob("**/*.py"):
-        if file.name[0]!='_': DocLinks(file, doc_func, _fn).build_index()
+    for file in globtastic(dest, file_glob="*.py", skip_folder_re="\.ipynb_checkpoints"):
+        if Path(file).name[0]!='_': DocLinks(file, doc_func, _fn).build_index()
 
 # %% ../nbs/04b_doclinks.ipynb 28
 @delegates(globtastic, but=['file_glob', 'skip_folder_re'])

nbdev/test.py

@@ -99,7 +99,7 @@ def nbdev_test(
     else: 
         _fence = '='*50
         failed = '\n\t'.join(f.name for p,f in zip(passed,files) if not p)
-        sys.stderr.write(f"\nnbdev Tests Failed On The Following Notebooks:\n{_fence}\n\t{failed}")
+        sys.stderr.write(f"\nnbdev Tests Failed On The Following Notebooks:\n{_fence}\n\t{failed}\n")
         exit(1)
     if timing:
         for i,t in sorted(enumerate(times), key=lambda o:o[1], reverse=True): print(f"{files[i].name}: {int(t)} secs")

nbs/04b_doclinks.ipynb

@@ -396,12 +396,11 @@
     "    if os.environ.get('IN_TEST',0): return\n",
     "    _fn = dest/'_modidx.py'\n",
     "    nbs_path = config_key('nbs_path')\n",
-    "    files = globtastic(nbs_path)\n",
     "    with contextlib.suppress(FileNotFoundError): _fn.unlink()\n",
     "    cfg = get_config()\n",
     "    doc_func = partial(_doc_link, urljoin(cfg.doc_host,cfg.doc_baseurl))\n",
-    "    for file in dest.glob(\"**/*.py\"):\n",
-    "        if file.name[0]!='_': DocLinks(file, doc_func, _fn).build_index()"
+    "    for file in globtastic(dest, file_glob=\"*.py\", skip_folder_re=\"\\.ipynb_checkpoints\"):\n",
+    "        if Path(file).name[0]!='_': DocLinks(file, doc_func, _fn).build_index()"
    ]
   },
   {

nbs/10_cli.ipynb

@@ -468,6 +468,8 @@
     "    cfg = get_config()\n",
     "    p = cfg.path('nbs_path')/'_quarto.yml'\n",
     "    vals = {k:cfg.get(k) for k in ['doc_path', 'title', 'description', 'branch', 'git_url', 'doc_host', 'doc_baseurl']}\n",
+    "    # Do not build _quarto_yml if custom_quarto_yml is set to True\n",
+    "    if str2bool(config_key('custom_quarto_yml', default=\"False\", path=False)): return\n",
     "    if 'title' not in vals: vals['title'] = vals['lib_name']\n",
     "    yml=_quarto_yml.format(**vals)\n",
     "    p.write_text(yml)"
@@ -660,7 +662,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3.8.12 ('.venv': venv)",
    "language": "python",
    "name": "python3"
   }

nbs/14_test.ipynb

@@ -206,7 +206,7 @@
     "    else: \n",
     "        _fence = '='*50\n",
     "        failed = '\\n\\t'.join(f.name for p,f in zip(passed,files) if not p)\n",
-    "        sys.stderr.write(f\"\\nnbdev Tests Failed On The Following Notebooks:\\n{_fence}\\n\\t{failed}\")\n",
+    "        sys.stderr.write(f\"\\nnbdev Tests Failed On The Following Notebooks:\\n{_fence}\\n\\t{failed}\\n\")\n",
     "        exit(1)\n",
     "    if timing:\n",
     "        for i,t in sorted(enumerate(times), key=lambda o:o[1], reverse=True): print(f\"{files[i].name}: {int(t)} secs\")"