rename nbs to keep sequential numbering after removing 4 and 5

Author: RensDimmendaal

fastcore/docments.py

@@ -1,8 +1,8 @@
 """Document parameters using comments."""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/06_docments.ipynb.
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/04_docments.ipynb.
 
-# %% ../nbs/06_docments.ipynb 2
+# %% ../nbs/04_docments.ipynb 2
 from __future__ import annotations
 
 import re,ast
@@ -22,35 +22,35 @@
 __all__ = ['empty', 'docstring', 'parse_docstring', 'isdataclass', 'get_dataclass_source', 'get_source', 'get_name', 'qual_name',
            'docments', 'extract_docstrings']
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def docstring(sym):
     "Get docstring for `sym` for functions ad classes"
     if isinstance(sym, str): return sym
     res = getdoc(sym)
     if not res and isclass(sym): res = getdoc(sym.__init__)
     return res or ""
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def parse_docstring(sym):
     "Parse a numpy-style docstring in `sym`"
     return AttrDict(**docscrape.NumpyDocString(docstring(sym)))
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def isdataclass(s):
     "Check if `s` is a dataclass but not a dataclass' instance"
     return is_dataclass(s) and isclass(s)
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def get_dataclass_source(s):
     "Get source code for dataclass `s`"
     return getsource(s) if not getattr(s, "__module__") == '__main__' else ""
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def get_source(s):
     "Get source code for string, function object or dataclass `s`"
     return getsource(s) if isfunction(s) or ismethod(s) else get_dataclass_source(s) if isdataclass(s) else s
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _parses(s):
     "Parse Python code in string, function object or dataclass `s`"
     return parse(dedent(get_source(s)))
@@ -85,10 +85,10 @@ def _param_locs(s, returns=True, args_kwargs=False):
             return res
     return None
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 empty = Parameter.empty
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _get_comment(line, arg, comments, parms):
     if line in comments: return comments[line].strip()
     line -= 1
@@ -105,7 +105,7 @@ def _get_full(p, docs):
         elif p.kind in (Parameter.VAR_POSITIONAL, Parameter.VAR_KEYWORD): anno = p.kind
     return AttrDict(docment=docs.get(p.name), anno=anno, default=p.default)
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _merge_doc(dm, npdoc):
     if not npdoc: return dm
     if not dm.anno or dm.anno==empty: dm.anno = npdoc.type
@@ -118,14 +118,14 @@ def _merge_docs(dms, npdocs):
     if 'return' in dms: params['return'] = _merge_doc(dms['return'], npdocs['Returns'])
     return params
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _get_property_name(p):
     "Get the name of property `p`"
     if hasattr(p, 'fget'):
         return p.fget.func.__qualname__ if hasattr(p.fget, 'func') else p.fget.__qualname__
     else: return next(iter(re.findall(r'\'(.*)\'', str(p)))).split('.')[-1]
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def get_name(obj):
     "Get the name of `obj`"
     if hasattr(obj, '__name__'):       return obj.__name__
@@ -134,14 +134,14 @@ def get_name(obj):
     elif type(obj)==property:          return _get_property_name(obj)
     else:                              return str(obj).split('.')[-1]
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def qual_name(obj):
     "Get the qualified name of `obj`"
     if hasattr(obj,'__qualname__'): return obj.__qualname__
     if ismethod(obj):       return f"{get_name(obj.__self__)}.{get_name(fn)}"
     return get_name(obj)
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _docments(s, returns=True, eval_str=False, args_kwargs=False):
     "`dict` of parameter names to 'docment-style' comments in function or string `s`"
     nps = parse_docstring(s)
@@ -160,7 +160,7 @@ def _docments(s, returns=True, eval_str=False, args_kwargs=False):
             if k in hints: v['anno'] = hints.get(k)
     return res
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 @delegates(_docments)
 def docments(elt, full=False, args_kwargs=False, **kwargs):
     "Generates a `docment`"
@@ -178,7 +178,7 @@ def _update_docments(f, r):
     if not full: r = {k:v['docment'] for k,v in r.items()}
     return AttrDict(r)
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def _get_params(node):
     params = [a.arg for a in node.args.args]
     if node.args.vararg: params.append(f"*{node.args.vararg.arg}")
@@ -215,7 +215,7 @@ def visit_Module(self, node):
         if module_doc: self.docstrings['_module'] = (module_doc, "")
         self.generic_visit(node)
 
-# %% ../nbs/06_docments.ipynb
+# %% ../nbs/04_docments.ipynb
 def extract_docstrings(code):
     "Create a dict from function/class/method names to tuples of docstrings and param lists"
     extractor = _DocstringExtractor()

fastcore/meta.py

@@ -1,38 +1,38 @@
 """Metaclasses"""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/07_meta.ipynb.
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/05_meta.ipynb.
 
 # %% auto 0
 __all__ = ['test_sig', 'FixSigMeta', 'PrePostInitMeta', 'AutoInit', 'NewChkMeta', 'BypassNewMeta', 'empty2none', 'anno_dict',
            'use_kwargs_dict', 'use_kwargs', 'delegates', 'method', 'funcs_kwargs']
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 from .imports import *
 from .test import *
 from contextlib import contextmanager
 from copy import copy
 import inspect
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def test_sig(f, b):
     "Test the signature of an object"
     test_eq(str(inspect.signature(f)), b)
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def _rm_self(sig):
     sigd = dict(sig.parameters)
     sigd.pop('self')
     return sig.replace(parameters=sigd.values())
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 class FixSigMeta(type):
     "A metaclass that fixes the signature on classes that override `__new__`"
     def __new__(cls, name, bases, dict):
         res = super().__new__(cls, name, bases, dict)
         if res.__init__ is not object.__init__: res.__signature__ = _rm_self(inspect.signature(res.__init__))
         return res
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 class PrePostInitMeta(FixSigMeta):
     "A metaclass that calls optional `__pre_init__` and `__post_init__` methods"
     def __call__(cls, *args, **kwargs):
@@ -43,20 +43,20 @@ def __call__(cls, *args, **kwargs):
             if hasattr(res,'__post_init__'): res.__post_init__(*args,**kwargs)
         return res
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 class AutoInit(metaclass=PrePostInitMeta):
     "Same as `object`, but no need for subclasses to call `super().__init__`"
     def __pre_init__(self, *args, **kwargs): super().__init__(*args, **kwargs)
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 class NewChkMeta(FixSigMeta):
     "Metaclass to avoid recreating object passed to constructor"
     def __call__(cls, x=None, *args, **kwargs):
         if not args and not kwargs and x is not None and isinstance(x,cls): return x
         res = super().__call__(*((x,) + args), **kwargs)
         return res
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 class BypassNewMeta(FixSigMeta):
     "Metaclass: casts `x` to this class if it's of type `cls._bypass_type`"
     def __call__(cls, x=None, *args, **kwargs):
@@ -66,20 +66,20 @@ def __call__(cls, x=None, *args, **kwargs):
         if cls!=x.__class__: x.__class__ = cls
         return x
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def empty2none(p):
     "Replace `Parameter.empty` with `None`"
     return None if p==inspect.Parameter.empty else p
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def anno_dict(f):
     "`__annotation__ dictionary with `empty` cast to `None`, returning empty if doesn't exist"
     return {k:empty2none(v) for k,v in getattr(f, '__annotations__', {}).items()}
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def _mk_param(n,d=None): return inspect.Parameter(n, inspect.Parameter.KEYWORD_ONLY, default=d)
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def use_kwargs_dict(keep=False, **kwargs):
     "Decorator: replace `**kwargs` in signature with `names` params"
     def _f(f):
@@ -93,7 +93,7 @@ def _f(f):
         return f
     return _f
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def use_kwargs(names, keep=False):
     "Decorator: replace `**kwargs` in signature with `names` params"
     def _f(f):
@@ -107,7 +107,7 @@ def _f(f):
         return f
     return _f
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def delegates(to:FunctionType=None, # Delegatee
               keep=False, # Keep `kwargs` in decorated function?
               but:list=None, # Exclude these parameters from signature
@@ -135,13 +135,13 @@ def _f(f):
         return f
     return _f
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def method(f):
     "Mark `f` as a method"
     # `1` is a dummy instance since Py3 doesn't allow `None` any more
     return MethodType(f, 1)
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def _funcs_kwargs(cls, as_method):
     old_init = cls.__init__
     def _init(self, *args, **kwargs):
@@ -157,7 +157,7 @@ def _init(self, *args, **kwargs):
     if hasattr(cls, '__signature__'): cls.__signature__ = _rm_self(inspect.signature(cls.__init__))
     return cls
 
-# %% ../nbs/07_meta.ipynb
+# %% ../nbs/05_meta.ipynb
 def funcs_kwargs(as_method=False):
     "Replace methods in `cls._methods` with those from `kwargs`"
     if callable(as_method): return _funcs_kwargs(as_method, False)