nbdev 2.3.25__tar.gz → 2.3.27__tar.gz

{nbdev-2.3.25/nbdev.egg-info → nbdev-2.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbdev
-Version: 2.3.25
+Version: 2.3.27
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/fastai/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -8,7 +8,7 @@ Author-email: j@fast.ai
 License: Apache Software License 2.0
 Project-URL: Documentation, https://nbdev.fast.ai/
 Keywords: nbdev fastai jupyter notebook export
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.7
@@ -143,10 +143,12 @@ available commands:
     nbdev_release_both        Release both conda and PyPI packages
     nbdev_release_gh          Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
     nbdev_release_git         Tag and create a release in GitHub for the current version
+    nbdev_requirements        Writes a `requirements.txt` file to `directory` based on settings.ini.
     nbdev_sidebar             Create sidebar.yml
     nbdev_test                Test in parallel notebooks matching `path`, passing along `flags`
     nbdev_trust               Trust notebooks matching `fname`
     nbdev_update              Propagate change in modules matching `fname` to notebooks that created them
+    nbdev_update_license      Allows you to update the license of your project.
 
 ## FAQ
 

{nbdev-2.3.25 → nbdev-2.3.27}/README.md

@@ -103,10 +103,12 @@ available commands:
     nbdev_release_both        Release both conda and PyPI packages
     nbdev_release_gh          Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
     nbdev_release_git         Tag and create a release in GitHub for the current version
+    nbdev_requirements        Writes a `requirements.txt` file to `directory` based on settings.ini.
     nbdev_sidebar             Create sidebar.yml
     nbdev_test                Test in parallel notebooks matching `path`, passing along `flags`
     nbdev_trust               Trust notebooks matching `fname`
     nbdev_update              Propagate change in modules matching `fname` to notebooks that created them
+    nbdev_update_license      Allows you to update the license of your project.
 
 ## FAQ
 

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.3.25"
+__version__ = "2.3.27"
 
 from .doclinks import nbdev_export
 from .showdoc import show_doc

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/config.py

@@ -66,6 +66,7 @@ def _apply_defaults(
     jupyter_hooks:bool_arg=False, # Run Jupyter hooks?
     clean_ids:bool_arg=True, # Remove ids from plaintext reprs?
     clear_all:bool_arg=False, # Remove all cell metadata and cell outputs?
+    cell_number:bool_arg=True, # Add cell number to the exported file
     put_version_in_init:bool_arg=True, # Add the version to the main __init__.py in nbdev_export
 ):
     "Apply default settings where missing in `cfg`."
@@ -222,7 +223,7 @@ def create_output(txt, mime):
 def show_src(src, lang='python'): return Markdown(f'```{lang}\n{src}\n```')
 
 # %% ../nbs/api/01_config.ipynb 48
-_re_version = re.compile('^__version__\s*=.*$', re.MULTILINE)
+_re_version = re.compile(r'^__version__\s*=.*$', re.MULTILINE)
 _init = '__init__.py'
 
 def update_version(path=None):
@@ -251,10 +252,12 @@ def add_init(path=None):
     if get_config().get('put_version_in_init', True): update_version(path)
 
 # %% ../nbs/api/01_config.ipynb 51
-def write_cells(cells, hdr, file, offset=0):
+def write_cells(cells, hdr, file, offset=0, cell_number=True):
     "Write `cells` to `file` along with header `hdr` starting at index `offset` (mainly for nbdev internal use)."
     for cell in cells:
-        if cell.source.strip(): file.write(f'\n\n{hdr} {cell.idx_+offset}\n{cell.source}')
+        if cell.source.strip():
+            idx = f" {cell.idx_+offset}" if cell_number else ""
+            file.write(f'\n\n{hdr}{idx}\n{cell.source}')
 
 # %% ../nbs/api/01_config.ipynb 52
 def _basic_export_nb(fname, name, dest=None):

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/doclinks.py

@@ -47,16 +47,22 @@ def _iter_py_cells(p):
     "Yield cells from an exported Python file."
     p = Path(p)
     cells = p.read_text(encoding='utf-8').split("\n# %% ")
+    has_cell_number = get_config().cell_number
     for cell in cells[1:]:
         top,code = cell.split('\n', 1)
         try:
-          *nb,idx = top.split()
-          nb = ' '.join(nb)
+            if has_cell_number:
+                *nb,idx = top.split()
+                nb = ' '.join(nb)
+                idx = int(idx)
+            else:
+                nb = top
+                idx = None
         except ValueError: raise ValueError(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())
+        yield AttrDict(nb=nb, idx=idx, code=code, nb_path=nb_path, py_path=p.resolve())
 
 # %% ../nbs/api/05_doclinks.ipynb 11
 def _nbpath2html(p): return p.with_name(re.sub(r'^\d+[a-zA-Z0-9]*_', '', p.name.lower())).with_suffix('.html')
@@ -71,7 +77,7 @@ def _get_modidx(py_path, code_root, nbs_path):
     _def_types = ast.FunctionDef,ast.AsyncFunctionDef,ast.ClassDef
     d = {}
     for cell in _iter_py_cells(py_path):
-        if cell.nb == 'auto': continue
+        if 'auto' in cell.nb: continue
         loc = _nbpath2html(cell.nb_path.relative_to(nbs_path))
 
         def _stor(nm):
@@ -98,7 +104,7 @@ def _build_modidx(dest=None, nbs_path=None, skip_exists=False):
     res['settings'] = {k:v for k,v in get_config().d.items()
                        if k in ('doc_host','doc_baseurl','lib_path','git_url','branch')}
     code_root = dest.parent.resolve()
-    for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re="\.ipynb_checkpoints"):
+    for file in globtastic(dest, file_glob="*.py", skip_file_re='^_', skip_folder_re=r"\.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)+'\n')
 

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/maker.py

@@ -207,7 +207,7 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
         f.write(f"# AUTOGENERATED! DO NOT EDIT! File to edit: {self.dest2nb}.")
         if last_future > 0: write_cells(cells[:last_future], self.hdr, f)
         if self.parse: f.write(f"\n\n# %% auto 0\n__all__ = {all_str}")
-        write_cells(cells[last_future:], self.hdr, f)
+        write_cells(cells[last_future:], self.hdr, f, cell_number=get_config().cell_number)
         f.write('\n')
 
 # %% ../nbs/api/02_maker.ipynb 38

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/quarto.py

@@ -68,7 +68,7 @@ def _sort(a):
     if y.startswith('index.'): return x,'00'
     return a
 #|export
-_def_file_re = '\.(?:ipynb|qmd|html)$'
+_def_file_re = r'\.(?:ipynb|qmd|html)$'
 
 @delegates(nbglob_cli)
 def _nbglob_docs(
@@ -87,12 +87,12 @@ def _recursive_parser(
         set_index: bool = True): # If `True`, `index` file will be set to href.
     for name, val in dir_dict.items():
         if type(val) is str:
-            if re.search('index\..*', re.sub('^\d+_', '', val)) and set_index and section:
+            if re.search('index\..*', re.sub(r'^\d+_', '', val)) and set_index and section:
                 section.update({'href': str(dirpath/val)})
             else:
                 contents.append(str(dirpath/val))
         elif type(val) is dict:
-            name = re.sub('^\d+_', '', name)
+            name = re.sub(r'^\d+_', '', name)
             section = {'section': name, 'contents': []}
             contents.append(section)
             _recursive_parser(val, section['contents'], dirpath/name, section=section)

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/showdoc.py

@@ -25,7 +25,7 @@ def _bold(s): return f'**{s}**' if s.strip() else s
 
 # %% ../nbs/api/08_showdoc.ipynb 7
 def _escape_markdown(s):
-    for c in '|^': s = re.sub(rf'\\?\{c}', f'\{c}', s)
+    for c in '|^': s = re.sub(rf'\\?\{c}', rf'\{c}', s)
     return s.replace('\n', '<br>')
 
 # %% ../nbs/api/08_showdoc.ipynb 9

{nbdev-2.3.25 → nbdev-2.3.27}/nbdev/sync.py

@@ -34,7 +34,7 @@ def _mod_files():
     return L(files for mod in midx.d['syms'].values() for _,files in mod.values()).unique()
 
 # %% ../nbs/api/06_sync.ipynb 8
-_re_import = re.compile("from\s+\S+\s+import\s+\S")
+_re_import = re.compile(r"from\s+\S+\s+import\s+\S")
 
 # %% ../nbs/api/06_sync.ipynb 10
 def _to_absolute(code, py_path, lib_dir):
@@ -67,6 +67,7 @@ def nbdev_update(fname:str=None): # A Python file name to update
     if fname and fname.endswith('.ipynb'): raise ValueError("`nbdev_update` operates on .py files.  If you wish to convert notebooks instead, see `nbdev_export`.")
     if os.environ.get('IN_TEST',0): return
     cfg = get_config()
+    if not cfg.cell_number: raise ValueError("`nbdev_update` does not support without cell_number in .py files. Please check your settings.ini")
     fname = Path(fname or cfg.lib_path)
     lib_dir = cfg.lib_path.parent
     files = globtastic(fname, file_glob='*.py', skip_folder_re='^[_.]').filter(lambda x: str(Path(x).absolute().relative_to(lib_dir) in _mod_files()))

{nbdev-2.3.25 → nbdev-2.3.27/nbdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbdev
-Version: 2.3.25
+Version: 2.3.27
 Summary: Create delightful software with Jupyter Notebooks
 Home-page: https://github.com/fastai/nbdev
 Author: Jeremy Howard and Hamel Husain
@@ -8,7 +8,7 @@ Author-email: j@fast.ai
 License: Apache Software License 2.0
 Project-URL: Documentation, https://nbdev.fast.ai/
 Keywords: nbdev fastai jupyter notebook export
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.7
@@ -143,10 +143,12 @@ available commands:
     nbdev_release_both        Release both conda and PyPI packages
     nbdev_release_gh          Calls `nbdev_changelog`, lets you edit the result, then pushes to git and calls `nbdev_release_git`
     nbdev_release_git         Tag and create a release in GitHub for the current version
+    nbdev_requirements        Writes a `requirements.txt` file to `directory` based on settings.ini.
     nbdev_sidebar             Create sidebar.yml
     nbdev_test                Test in parallel notebooks matching `path`, passing along `flags`
     nbdev_trust               Trust notebooks matching `fname`
     nbdev_update              Propagate change in modules matching `fname` to notebooks that created them
+    nbdev_update_license      Allows you to update the license of your project.
 
 ## FAQ
 

{nbdev-2.3.25 → nbdev-2.3.27}/settings.ini

@@ -9,12 +9,12 @@ author = Jeremy Howard and Hamel Husain
 author_email = j@fast.ai
 branch = master
 min_python = 3.7
-version = 2.3.25
+version = 2.3.27
 audience = Developers
 language = English
 custom_sidebar = True
 license = apache2
-status = 2
+status = 5
 requirements = fastcore>=1.5.27 execnb>=0.1.4 astunparse ghapi>=1.0.3 watchdog asttokens
 pip_requirements = PyYAML
 conda_requirements = pyyaml
@@ -66,5 +66,6 @@ allowed_cell_metadata_keys =
 jupyter_hooks = True
 clean_ids = False
 clear_all = False
+cell_number = True
 put_version_in_init = True