fixes #1647

Author: jph00

nbdev/doclinks.py

@@ -129,12 +129,15 @@ def nbglob_cli(
     symlinks:bool=False, # Follow symlinks?
     file_glob:str='*.ipynb', # Only include files matching glob
     file_re:str=None, # Only include files matching regex
+    path_glob:str=None, # Only include files whose full paths match glob (wildcards match separators)
+    path_re:str=None, # Only include files whose full paths match regex
     folder_re:str=None, # Only enter folders matching regex
     skip_file_glob:str=None, # Skip files matching glob
     skip_file_re:str='^[_.]', # Skip files matching regex
     skip_folder_re:str = '^[_.]'): # Skip folders matching regex
     "Find all files in a directory matching an extension given a config key."
-    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,
+    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re,
+                  path_glob=path_glob, path_re=path_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/05_doclinks.ipynb #5e6fbe08

nbdev/test.py

@@ -143,7 +143,7 @@ def _keep_file(
 @call_parse(pos=['path'])
 @delegates(nbglob_cli)
 def nbdev_test(
-    path:str=None,  # A notebook name or glob to test
+    path:str=None,  # A notebook, directory, or full-path glob to test
     flags:str='',  # Space separated list of test flags to run that are normally ignored
     n_workers:int=None,  # Number of workers
     timing:bool=False,  # Time each notebook to see which are slow
@@ -157,6 +157,7 @@ def nbdev_test(
     **kwargs
 ):
     "Test in parallel notebooks matching `path`, passing along `flags`"
+    if path and not Path(path).exists(): kwargs['path_glob'],path = os.path.abspath(path),Path.cwd()
     cfg = get_config(Path(path).resolve() if path else None)
     cell_timeout,cell_timing_min = ifnone(cell_timeout, cfg.cell_timeout),ifnone(cell_timing_min, cfg.get('cell_timing_min'))
     skip_flags = cfg.tst_flags

nbs/api/05_doclinks.ipynb

@@ -346,12 +346,15 @@
     "    symlinks:bool=False, # Follow symlinks?\n",
     "    file_glob:str='*.ipynb', # Only include files matching glob\n",
     "    file_re:str=None, # Only include files matching regex\n",
+    "    path_glob:str=None, # Only include files whose full paths match glob (wildcards match separators)\n",
+    "    path_re:str=None, # Only include files whose full paths match regex\n",
     "    folder_re:str=None, # Only enter folders matching regex\n",
     "    skip_file_glob:str=None, # Skip files matching glob\n",
     "    skip_file_re:str='^[_.]', # Skip files matching regex\n",
     "    skip_folder_re:str = '^[_.]'): # Skip folders matching regex\n",
     "    \"Find all files in a directory matching an extension given a config key.\"\n",
-    "    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re, folder_re=folder_re,\n",
+    "    return nbglob(path, symlinks=symlinks, file_glob=file_glob, file_re=file_re,\n",
+    "                  path_glob=path_glob, path_re=path_re, folder_re=folder_re,\n",
     "                  skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, skip_folder_re=skip_folder_re)"
    ]
   },

nbs/api/12_test.ipynb

@@ -344,7 +344,7 @@
     "@call_parse(pos=['path'])\n",
     "@delegates(nbglob_cli)\n",
     "def nbdev_test(\n",
-    "    path:str=None,  # A notebook name or glob to test\n",
+    "    path:str=None,  # A notebook, directory, or full-path glob to test\n",
     "    flags:str='',  # Space separated list of test flags to run that are normally ignored\n",
     "    n_workers:int=None,  # Number of workers\n",
     "    timing:bool=False,  # Time each notebook to see which are slow\n",
@@ -358,6 +358,7 @@
     "    **kwargs\n",
     "):\n",
     "    \"Test in parallel notebooks matching `path`, passing along `flags`\"\n",
+    "    if path and not Path(path).exists(): kwargs['path_glob'],path = os.path.abspath(path),Path.cwd()\n",
     "    cfg = get_config(Path(path).resolve() if path else None)\n",
     "    cell_timeout,cell_timing_min = ifnone(cell_timeout, cfg.cell_timeout),ifnone(cell_timing_min, cfg.get('cell_timing_min'))\n",
     "    skip_flags = cfg.tst_flags\n",
@@ -436,7 +437,15 @@
     "\n",
     "```\n",
     "nbdev-test ../../tests --file-re '.*test.ipynb' --do-print\n",
-    "```"
+    "```\n",
+    "\n",
+    "An omitted path uses the configured `nbs_path`. An existing file or directory is used directly. A path that does not exist is treated as a full-path glob filter over the working directory's tree. Quote patterns to prevent shell expansion:\n",
+    "\n",
+    "```sh\n",
+    "nbdev-test 'nbs/api/*test*.ipynb'\n",
+    "```\n",
+    "\n",
+    "The glob uses `fnmatch`: `*` matches directory separators and `**` has no special meaning. Use `--path-re` for regex filtering on full paths. `--file-re` matches filenames only."
    ]
   },
   {

pyproject.toml

@@ -19,12 +19,11 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 dynamic = ["version"]
-dependencies = [ "fastcore>=2.2.23", "execnb>=0.3.3", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
+dependencies = [ "fastcore>=2.2.28", "execnb>=0.3.3", "astunparse", "ghapi>=2.0.2", "watchdog", "asttokens",
     "setuptools", "build", "fastgit>=0.0.7", "pyyaml", "tomli; python_version < '3.11'", ]
 
 [project.optional-dependencies]
-dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "nbclassic",
-    "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", ]
+dev = [ "ipywidgets", "nbdev-numpy", "nbdev-stdlib", "pandas", "matplotlib", "black", "svg.py", "pysym2md>=0.0.6", "llms-txt", "sphinx", "plum-dispatch", ]
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/nbdev"