nbdev 3.3.18__tar.gz → 3.3.20__tar.gz

{nbdev-3.3.18/nbdev.egg-info → nbdev-3.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.18
+Version: 3.3.20
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.23
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: execnb>=0.3.3
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
@@ -35,7 +35,6 @@ Requires-Dist: pandas; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: svg.py; extra == "dev"
-Requires-Dist: nbclassic; extra == "dev"
 Requires-Dist: pysym2md>=0.0.6; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev/__init__.py

@@ -6,7 +6,7 @@ Modules:
 - `nbdev.moddocs`: # Module docs: creating them from existing notebooks
 - `nbdev.skill`: Author nbdev notebooks as source, documentation, examples, and tests. Ensure this guidance is in context before any notebook edit."""
 
-__version__ = "3.3.18"
+__version__ = "3.3.20"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev/cli.py

@@ -156,16 +156,16 @@ async def nbdev_update_license(
 
     mapped = mapping.get(to, None)
     if mapped not in avail_lic: raise ValueError(f"{to} is not an available license")
-    body = (await api.licenses.get(mapped))['body']
+    lic = await api.licenses.get(mapped)
 
     copyright = f"{datetime.now().year}, {cfg.author}"
-    body = body.replace('[year], [fullname]', copyright)
+    body = lic['body'].replace('[year], [fullname]', copyright)
     body = body.replace('[year] [fullname]', copyright)
 
     # Update pyproject.toml
     pyproj = cfg.config_file
     content = pyproj.read_text()
-    content = re.sub(r'^(license\s*=\s*\{text\s*=\s*").*?(")', rf'\g<1>{to}\2', content, flags=re.MULTILINE)
+    content = re.sub(r'^license\s*=.*$', f'license = "{lic.spdx_id}"', content, flags=re.MULTILINE)
     pyproj.write_text(content)
 
     Path('LICENSE').write_text(body)

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev/config.py

@@ -71,7 +71,7 @@ def _fetch_from_git(raise_err=False):
 
 # %% ../nbs/api/01_config.ipynb #05aae09f
 pyproject_tmpl = '''[build-system]
-requires = ["setuptools>=64"]
+requires = ["setuptools>=77"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -80,7 +80,7 @@ dynamic = ["version"]
 description = "{description}"
 readme = "README.md"
 requires-python = ">={min_python}"
-license = {{text = "{license}"}}
+license = "{license}"
 authors = [{{name = "{author}", email = "{author_email}"}}]
 keywords = {keywords}
 classifiers = [

{nbdev-3.3.18 → nbdev-3.3.20}/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-3.3.18 → nbdev-3.3.20}/nbdev/serve.py

@@ -87,7 +87,7 @@ def proc_nbs(
     (cache/'_quarto.yml').unlink(missing_ok=True)  # single-doc renders strip the staged copy in place (`_strip_sidebar`), so always restage it
 
     files = files.map(_proc_file, mtime=cache_mtime, cache=cache, path=path).filter()
-    kw = {} if IN_NOTEBOOK else {'method':'spawn'}
+    kw = {} if in_notebook() else {'method':'spawn'}
     parallel(nbdev.serve_drv.main, files, n_workers=n_workers, pause=0.01, **kw)
     if cache.exists(): cache.touch()
     return cache

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev/skill.py

@@ -4,7 +4,7 @@
 
 Write notebooks to be read top-to-bottom, interleaving implementation, explanation, examples, outputs, and failure demonstrations. These conventions target published libraries; match surrounding notebooks in internal projects.
 
-Check the file, not the repo: `# AUTOGENERATED! DO NOT EDIT!` names the source notebook; `# %% ../nbs/04_usage.ipynb #a45f753a` identifies the source cell. Edit that notebook, never generated modules, `__all__`, `_modidx.py`, or module docstrings; `nbdev-export` regenerates them. Unmarked modules are hand-written. Use notebooks where narrative/examples teach the API, plain `.py` for dense mechanism iterated under pytest. Tests follow source form: lesson cells for notebooks, `tests/*.py` for plain modules.
+Check the file, not the repo: `# AUTOGENERATED! DO NOT EDIT!` names the source notebook; `# %% ../nbs/04_usage.ipynb #a45f753a` identifies the source cell. Edit that notebook, never generated modules, `__all__`, `_modidx.py`, or module docstrings; `nbdev-export` regenerates them. Unmarked modules are hand-written. Use notebooks where narrative/examples teach the API, plain `.py` for dense mechanism iterated under pytest (which should be very rare; never add pytests to a project that doesn't have any, unless explicitly requested). Tests follow source form: lesson cells for notebooks, `tests/*.py` for plain modules.
 
 For project-level questions, read `nbs/index.ipynb`, the source of README.md; regenerate with `nbdev-readme` after changes.
 
@@ -36,7 +36,7 @@ Check claims by running code before documenting them; preview assembly with `nbd
 
 Write page content, not standalone test cells (except rare hidden checks): realistic values, minimal setup, reused objects, and direct assertions that support the lesson. End lesson cells with an informative displayed value when there is something useful to show. Compact `_repr_markdown_` or structured summaries can make later examples readable; plots, tables, images, and HTML also provide evidence. Explain what matters in large outputs and keep stored results focused.
 
-Use `fastcore.test` assertions and `expect_fail` in ordinary code cells, with one focused error example per contract. Keep check plumbing, mocks, dense comprehensions, and long setup out of reader-facing examples: extract a small helper or hide the check.
+Use `fastcore.test` assertions and `expect_fail` in ordinary code cells, with one focused error example per contract. Keep check plumbing, mocks, dense comprehensions, and long setup out of reader-facing examples: extract a small helper or hide the check. Use `nbdev-test --file-re` for running >1 named notebook, since they'll run in parallel.
 
 Review these as rewrite signals, not absolute rules:
 

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev/test.py

@@ -92,12 +92,12 @@ def test_nb(
     cell_timing_min:float=None # print cells slower than this many seconds (None: no timing output)
 ):
     "Execute tests in notebook in `fn` except those with `skip_flags`"
-    if not IN_NOTEBOOK and threading.current_thread() is threading.main_thread(): signal.signal(signal.SIGINT, _int_handler)
+    if not in_notebook() and threading.current_thread() is threading.main_thread(): signal.signal(signal.SIGINT, _int_handler)
     fn = Path(fn)
     _cur_nb[0] = fn
     if basepath: sys.path.insert(0, str(basepath))
     prev_test = os.environ.get('IN_TEST')
-    if not IN_NOTEBOOK: os.environ['IN_TEST'] = '1'
+    if not in_notebook(): os.environ['IN_TEST'] = '1'
     try:
         nb = NBProcessor(fn, rm_directives=False, process=True).nb
         fm = nb_frontmatter(nb)
@@ -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
@@ -167,7 +168,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)
-    if IN_NOTEBOOK: kw = {'method':'spawn'} if os.name=='nt' or sys.platform=='darwin' else {'method':'forkserver'}
+    if in_notebook(): kw = {'method':'spawn'} if os.name=='nt' or sys.platform=='darwin' else {'method':'forkserver'}
     else: kw = {'method':'spawn'} if sys.platform=='darwin' else {}
     wd_pth = cfg.nbs_path
     with working_directory(wd_pth if (wd_pth and wd_pth.exists()) else os.getcwd()):

{nbdev-3.3.18 → nbdev-3.3.20/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdev
-Version: 3.3.18
+Version: 3.3.20
 Summary: Create delightful software with Jupyter Notebooks
 Author-email: "Jeremy Howard and the fast.ai community" <j@fast.ai>
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.2.23
+Requires-Dist: fastcore>=2.2.28
 Requires-Dist: execnb>=0.3.3
 Requires-Dist: astunparse
 Requires-Dist: ghapi>=2.0.2
@@ -35,7 +35,6 @@ Requires-Dist: pandas; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: svg.py; extra == "dev"
-Requires-Dist: nbclassic; extra == "dev"
 Requires-Dist: pysym2md>=0.0.6; extra == "dev"
 Requires-Dist: llms-txt; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"

{nbdev-3.3.18 → nbdev-3.3.20}/nbdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=2.2.23
+fastcore>=2.2.28
 execnb>=0.3.3
 astunparse
 ghapi>=2.0.2
@@ -20,7 +20,6 @@ pandas
 matplotlib
 black
 svg.py
-nbclassic
 pysym2md>=0.0.6
 llms-txt
 sphinx

{nbdev-3.3.18 → nbdev-3.3.20}/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"