implemented suggested change

Author: omlnaut

nbdev/doclinks.py

@@ -109,7 +109,7 @@ def nbglob(path=None, skip_folder_re = '^[_.]', file_glob='*.ipynb', skip_file_r
     res = res.map(Path) if as_path else res
     return res
 
-# %% ../nbs/api/doclinks.ipynb 22
+# %% ../nbs/api/doclinks.ipynb 21
 def nbglob_cli(
     path:str=None, # Path to notebooks
     symlinks:bool=False, # Follow symlinks?
@@ -123,24 +123,24 @@ def nbglob_cli(
     return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,
                   skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re)
 
-# %% ../nbs/api/doclinks.ipynb 23
+# %% ../nbs/api/doclinks.ipynb 22
 @call_parse
 @delegates(nbglob_cli)
 def nbdev_export(
     path:str=None, # Path or filename
     **kwargs):
     "Export notebooks in `path` to Python modules"
     if os.environ.get('IN_TEST',0): return
-    files = nbglob(path=path, **kwargs)#.sorted(lambda path_str: Path(path_str).name)
+    files = nbglob(path=path, as_path=True, **kwargs).sorted('name')
     for f in files: nb_export(f)
     add_init(get_config().lib_path)
     _build_modidx()
 
-# %% ../nbs/api/doclinks.ipynb 27
+# %% ../nbs/api/doclinks.ipynb 26
 import importlib,ast
 from functools import lru_cache
 
-# %% ../nbs/api/doclinks.ipynb 28
+# %% ../nbs/api/doclinks.ipynb 27
 def _find_mod(mod):
     mp,_,mr = mod.partition('/')
     spec = importlib.util.find_spec(mp)
@@ -163,7 +163,7 @@ def _get_exps(mod):
 
 def _lineno(sym, fname): return _get_exps(fname).get(sym, None) if fname else None
 
-# %% ../nbs/api/doclinks.ipynb 30
+# %% ../nbs/api/doclinks.ipynb 29
 def _qual_sym(s, settings):
     if not isinstance(s,tuple): return s
     nb,py = s
@@ -178,10 +178,10 @@ def _qual_syms(entries):
     if 'doc_host' not in settings: return entries
     return {'syms': {mod:_qual_mod(d, settings) for mod,d in entries['syms'].items()}, 'settings':settings}
 
-# %% ../nbs/api/doclinks.ipynb 31
+# %% ../nbs/api/doclinks.ipynb 30
 _re_backticks = re.compile(r'`([^`\s]+)`')
 
-# %% ../nbs/api/doclinks.ipynb 32
+# %% ../nbs/api/doclinks.ipynb 31
 @lru_cache(None)
 class NbdevLookup:
     "Mapping from symbol names to docs and source URLs"

nbs/api/doclinks.ipynb

@@ -351,7 +351,7 @@
     "    **kwargs):\n",
     "    \"Export notebooks in `path` to Python modules\"\n",
     "    if os.environ.get('IN_TEST',0): return\n",
-    "    files = sorted(nbglob(path=path, **kwargs), key=lambda path_str: Path(path_str).name)\n",
+    "    files = nbglob(path=path, as_path=True, **kwargs).sorted('name')\n",
     "    for f in files: nb_export(f)\n",
     "    add_init(get_config().lib_path)\n",
     "    _build_modidx()"
@@ -377,27 +377,29 @@
     "    pass\n",
     "\n",
     "def nb_export_mock(nb_path: str):\n",
-    "    assert nb_path==expected_order.pop()\n",
+    "    expected = expected_order.pop()\n",
+    "    assert nb_path==expected, f'Expected {expected}, got {nb_path}'\n",
     "    \n",
     "    # escape from the outer function as the tests are done\n",
     "    if not expected_order:\n",
     "        raise EscapeException()\n",
     "        \n",
-    "\n",
+    "# replace those functions by mocks, saving the original objects\n",
     "nbglob_save = copy(nbglob)\n",
     "nb_export_save = copy(nb_export)\n",
     "\n",
-    "nbglob = lambda *args, **kwargs: ['../../8.ipynb', 'api/3.ipynb', '4.ipynb']\n",
+    "nbglob = lambda *args, **kwargs: L(['../../8.ipynb', 'api/3.ipynb', '4.ipynb']).map(Path)\n",
     "\n",
-    "expected_order = ['api/3.ipynb', '4.ipynb', '../../8.ipynb']\n",
-    "expected_order.reverse()\n",
+    "expected_order = reversed(L(['api/3.ipynb', '4.ipynb', '../../8.ipynb']).map(Path))\n",
+    "#expected_order.reverse()\n",
     "nb_export = nb_export_mock\n",
     "\n",
     "try:\n",
     "    nbdev_export()\n",
     "except EscapeException:\n",
     "    pass # this silences the exception used to end nbdev_export early\n",
     "\n",
+    "# restore original objects to make sure the notebook runs as intended\n",
     "nbglob = nbglob_save\n",
     "nb_export = nb_export_save"
    ]