fix conflicts

Author: hamelsmu

nbdev/_modidx.py

@@ -332,4 +332,4 @@
                             'nbdev.sync.nbdev_update': ('api/sync.html#nbdev_update', 'nbdev/sync.py')},
             'nbdev.test': { 'nbdev.test._keep_file': ('api/test.html#_keep_file', 'nbdev/test.py'),
                             'nbdev.test.nbdev_test': ('api/test.html#nbdev_test', 'nbdev/test.py'),
-                            'nbdev.test.test_nb': ('api/test.html#test_nb', 'nbdev/test.py')}}}
+                            'nbdev.test.test_nb': ('api/test.html#test_nb', 'nbdev/test.py')}}}

nbdev/doclinks.py

@@ -49,13 +49,16 @@ def _iter_py_cells(p):
     cells = p.read_text().split("\n# %% ")
     for cell in cells[1:]:
         top,code = cell.split('\n', 1)
-        nb,idx = top.split()
+        try: nb,idx = top.split()
+        except ValueError:
+            raise NotImplementedError(f"Unexpected format in '{p}' at cell:\n```\n# %% {cell.strip()}.\n```\n"
+                                      "The expected format is: '# %% {nb_path} {cell_idx}'.")
         nb_path = None if nb=='auto' else (p.parent/nb).resolve()  # NB paths are stored relative to .py file
         if code.endswith('\n'): code=code[:-1]
         yield AttrDict(nb=nb, idx=int(idx), code=code, nb_path=nb_path, py_path=p.resolve())
 
 # %% ../nbs/api/doclinks.ipynb 11
-def _nbpath2html(p): return p.with_name(re.sub(r'\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html')
+def _nbpath2html(p): return p.with_name(re.sub(r'\d+[a-zA-Z0-9]+_', '', p.name.lower())).with_suffix('.html')
 
 # %% ../nbs/api/doclinks.ipynb 13
 def _get_modidx(py_path, code_root, nbs_path):
@@ -96,7 +99,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     code_root = dest.parent.resolve()
     for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re="\.ipynb_checkpoints"):
         res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))
-    idxfile.write_text("# Autogenerated by nbdev\n\nd = "+pformat(res, width=140, indent=2, compact=True))
+    idxfile.write_text("# Autogenerated by nbdev\n\nd = "+pformat(res, width=140, indent=2, compact=True)+'\n')
 
 # %% ../nbs/api/doclinks.ipynb 20
 @delegates(globtastic)

nbdev/export.py

@@ -41,19 +41,19 @@ def black_format(cell, # Cell to format
         except: pass
 
 # %% ../nbs/api/export.ipynb 9
-def nb_export(nbname, lib_path=None, procs=black_format, debug=False, mod_maker=ModuleMaker):
+def nb_export(nbname, lib_path=None, procs=black_format, 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()
     nb = NBProcessor(nbname, [exp]+L(procs), debug=debug)
     nb.process()
     for mod,cells in exp.modules.items():
         all_cells = exp.in_all[mod]
-        name = getattr(exp, 'default_exp', None) if mod=='#' else mod
-        if not name:
+        nm = ifnone(name, getattr(exp, 'default_exp', None) if mod=='#' else mod)
+        if not nm:
             warn(f"Notebook '{nbname}' uses `#|export` without `#|default_exp` cell.\n"
                  "Note nbdev2 no longer supports nbdev1 syntax. Run `nbdev_migrate` to upgrade.\n"
                  "See https://nbdev.fast.ai/getting_started.html for more information.")
             return
-        mm = mod_maker(dest=lib_path, name=name, nb_path=nbname, is_new=mod=='#')
+        mm = mod_maker(dest=lib_path, name=nm, nb_path=nbname, is_new=bool(name) or mod=='#')
         mm.make(cells, all_cells, lib_path=lib_path)

nbdev/processors.py

@@ -211,7 +211,7 @@ def end(self):
             mimetype = 'application/vnd.jupyter.widget-state+json'
             old = nested_idx(self.nb.metadata, 'widgets', mimetype) or {'state': {}}
             new = Widget.get_manager_state(drop_defaults=True)
-            widgets = {**old, **new, 'state': {**old['state'], **new['state']}}
+            widgets = {**old, **new, 'state': {**old.get('state', {}), **new['state']}}
             self.nb.metadata['widgets'] = {mimetype: widgets}
 
 # %% ../nbs/api/processors.ipynb 42

nbdev/quarto.py

@@ -30,11 +30,11 @@ def _sprun(cmd):
 
 def _install_linux():
     system(f'curl -LO {BASE_QUARTO_URL}quarto-linux-amd64.deb')
-    system('sudo dpkg -i *64.deb && rm *64.deb')
+    system('sudo dpkg -i quarto-linux-amd64.deb && rm quarto-linux-amd64.deb')
 
 def _install_mac():
     system(f'curl -LO {BASE_QUARTO_URL}quarto-macos.pkg')
-    system('sudo installer -pkg quarto-macos.pkg -target /')
+    system('sudo installer -pkg quarto-macos.pkg -target / && rm quarto-macos.pkg')
 
 @call_parse
 def install_quarto():
@@ -104,7 +104,7 @@ def _f(a,b): return Path(a),b
 
     yml_path = path/'sidebar.yml'
     yml = "website:\n  sidebar:\n    contents:\n"
-    yml += '\n'.join(f'      {o}' for o in res)
+    yml += '\n'.join(f'      {o}' for o in res)+'\n'
     if printit: return print(yml)
     yml_path.write_text(yml)
 

nbs/api/doclinks.ipynb

@@ -137,7 +137,10 @@
     "    cells = p.read_text().split(\"\\n# %% \")\n",
     "    for cell in cells[1:]:\n",
     "        top,code = cell.split('\\n', 1)\n",
-    "        nb,idx = top.split()\n",
+    "        try: nb,idx = top.split()\n",
+    "        except ValueError:\n",
+    "            raise NotImplementedError(f\"Unexpected format in '{p}' at cell:\\n```\\n# %% {cell.strip()}.\\n```\\n\"\n",
+    "                                      \"The expected format is: '# %% {nb_path} {cell_idx}'.\")\n",
     "        nb_path = None if nb=='auto' else (p.parent/nb).resolve()  # NB paths are stored relative to .py file\n",
     "        if code.endswith('\\n'): code=code[:-1]\n",
     "        yield AttrDict(nb=nb, idx=int(idx), code=code, nb_path=nb_path, py_path=p.resolve())"
@@ -162,7 +165,7 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "def _nbpath2html(p): return p.with_name(re.sub(r'\\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html')"
+    "def _nbpath2html(p): return p.with_name(re.sub(r'\\d+[a-zA-Z0-9]+_', '', p.name.lower())).with_suffix('.html')"
    ]
   },
   {
@@ -237,7 +240,7 @@
     "    code_root = dest.parent.resolve()\n",
     "    for file in globtastic(dest, file_glob=\"*.py\", skip_file_re='^_', skip_folder_re=\"\\.ipynb_checkpoints\"):\n",
     "        res['syms'].update(_get_modidx((dest.parent/file).resolve(), code_root, nbs_path=nbs_path))\n",
-    "    idxfile.write_text(\"# Autogenerated by nbdev\\n\\nd = \"+pformat(res, width=140, indent=2, compact=True))"
+    "    idxfile.write_text(\"# Autogenerated by nbdev\\n\\nd = \"+pformat(res, width=140, indent=2, compact=True)+'\\n')"
    ]
   },
   {

nbs/api/export.ipynb

@@ -134,21 +134,21 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "def nb_export(nbname, lib_path=None, procs=black_format, debug=False, mod_maker=ModuleMaker):\n",
+    "def nb_export(nbname, lib_path=None, procs=black_format, debug=False, mod_maker=ModuleMaker, name=None):\n",
     "    \"Create module(s) from notebook\"\n",
     "    if lib_path is None: lib_path = get_config().lib_path\n",
     "    exp = ExportModuleProc()\n",
     "    nb = NBProcessor(nbname, [exp]+L(procs), debug=debug)\n",
     "    nb.process()\n",
     "    for mod,cells in exp.modules.items():\n",
     "        all_cells = exp.in_all[mod]\n",
-    "        name = getattr(exp, 'default_exp', None) if mod=='#' else mod\n",
-    "        if not name:\n",
+    "        nm = ifnone(name, getattr(exp, 'default_exp', None) if mod=='#' else mod)\n",
+    "        if not nm:\n",
     "            warn(f\"Notebook '{nbname}' uses `#|export` without `#|default_exp` cell.\\n\"\n",
     "                 \"Note nbdev2 no longer supports nbdev1 syntax. Run `nbdev_migrate` to upgrade.\\n\"\n",
     "                 \"See https://nbdev.fast.ai/getting_started.html for more information.\")\n",
     "            return\n",
-    "        mm = mod_maker(dest=lib_path, name=name, nb_path=nbname, is_new=mod=='#')\n",
+    "        mm = mod_maker(dest=lib_path, name=nm, nb_path=nbname, is_new=bool(name) or mod=='#')\n",
     "        mm.make(cells, all_cells, lib_path=lib_path)"
    ]
   },

nbs/api/processors.ipynb

@@ -609,7 +609,7 @@
     "            mimetype = 'application/vnd.jupyter.widget-state+json'\n",
     "            old = nested_idx(self.nb.metadata, 'widgets', mimetype) or {'state': {}}\n",
     "            new = Widget.get_manager_state(drop_defaults=True)\n",
-    "            widgets = {**old, **new, 'state': {**old['state'], **new['state']}}\n",
+    "            widgets = {**old, **new, 'state': {**old.get('state', {}), **new['state']}}\n",
     "            self.nb.metadata['widgets'] = {mimetype: widgets}"
    ]
   },

nbs/api/quarto.ipynb

@@ -89,11 +89,11 @@
     "\n",
     "def _install_linux():\n",
     "    system(f'curl -LO {BASE_QUARTO_URL}quarto-linux-amd64.deb')\n",
-    "    system('sudo dpkg -i *64.deb && rm *64.deb')\n",
+    "    system('sudo dpkg -i quarto-linux-amd64.deb && rm quarto-linux-amd64.deb')\n",
     "    \n",
     "def _install_mac():\n",
     "    system(f'curl -LO {BASE_QUARTO_URL}quarto-macos.pkg')\n",
-    "    system('sudo installer -pkg quarto-macos.pkg -target /')\n",
+    "    system('sudo installer -pkg quarto-macos.pkg -target / && rm quarto-macos.pkg')\n",
     "\n",
     "@call_parse\n",
     "def install_quarto():\n",
@@ -195,7 +195,7 @@
     "\n",
     "    yml_path = path/'sidebar.yml'\n",
     "    yml = \"website:\\n  sidebar:\\n    contents:\\n\"\n",
-    "    yml += '\\n'.join(f'      {o}' for o in res)\n",
+    "    yml += '\\n'.join(f'      {o}' for o in res)+'\\n'\n",
     "    if printit: return print(yml)\n",
     "    yml_path.write_text(yml)"
    ]

nbs/blog/posts/2022-11-07-spaces/index.qmd

@@ -220,4 +220,4 @@ After a couple of minutes, you will see your app published!  This app is publish
 Hopefully you felt something magical while doing this example.  Even though the target application required you to write a python script (`app.py`), you didn't have to refactor your script from a notebook!  I believe that you shouldn't have to refactor your code and switch contexts even when creating python packages!  If this intrigues you, check out [nbdev](https://nbdev.fast.ai/blog/posts/2022-07-28-nbdev2/)
 
 
-[^1]: The prompt that generated the cover image is: "A data scientist at a computer in a futuristic city with a view of the planet Jupyter in the night sky, trending on artstation, high detail, science-fiction"
+[^1]: The prompt that generated the cover image is: "A data scientist at a computer in a futuristic city with a view of the planet Jupyter in the night sky, trending on artstation, high detail, science-fiction"