Merge branch 'master' into Fix-AttrDict-copy

Author: jph00

.github/workflows/main.yml

@@ -112,4 +112,4 @@ jobs:
     - name: Test fastai notebooks
       run: |
         cd fastai
-        nbdev_test --flags '' --n_workers 3 --pause 1.5 --fname "nbs/[0-9]${{matrix.nb}}*.ipynb"
+        nbdev_test --flags '' --n_workers 3 --pause 1.5 --file_re "[0-9]${{matrix.nb}}.*"

fastcore/_modidx.py

@@ -1,8 +1,11 @@
 # Autogenerated by nbdev
 
-d = { 'settings': { 'audience': 'Developers',
+d = { 'settings': { 'allowed_cell_metadata_keys': '',
+                'allowed_metadata_keys': '',
+                'audience': 'Developers',
                 'author': 'Jeremy Howard and Sylvain Gugger',
                 'author_email': '[email protected]',
+                'black_formatting': 'False',
                 'branch': 'master',
                 'copyright': 'fast.ai',
                 'custom_sidebar': 'False',
@@ -20,8 +23,11 @@
                 'license': 'apache2',
                 'min_python': '3.7',
                 'nbs_path': 'nbs',
+                'readme_nb': 'index.ipynb',
+                'recursive': 'False',
                 'status': '4',
                 'title': 'fastcore',
+                'tst_flags': '',
                 'user': 'fastai',
                 'version': '1.5.15'},
   'syms': { 'fastcore.all': {},

fastcore/foundation.py

@@ -249,17 +249,19 @@ def read_config_file(file, **kwargs):
 # %% ../nbs/02_foundation.ipynb 131
 class Config:
     "Reading and writing `ConfigParser` ini files"
-    def __init__(self, cfg_path, cfg_name, create=None):
+    def __init__(self, cfg_path, cfg_name, create=None, save=True, extra_files=None):
         cfg_path = Path(cfg_path).expanduser().absolute()
         self.config_path,self.config_file = cfg_path,cfg_path/cfg_name
-        if not self.config_file.exists():
-            if create:
-                self.d = create
+        self._cfg = ConfigParser()
+        self.d = self._cfg['DEFAULT']
+        found = [Path(o) for o in self._cfg.read(L(extra_files)+[self.config_file])]
+        if self.config_file not in found and create is not None:
+            self._cfg.read_dict({'DEFAULT':create})
+            if save:
                 cfg_path.mkdir(exist_ok=True, parents=True)
-                self.save()
-            else: raise FileNotFoundError(f"Could not find {cfg_name}")
-        self.d = read_config_file(self.config_file)
+                save_config_file(self.config_file, create)
 
+    def __repr__(self): return repr(dict(self._cfg.items('DEFAULT', raw=True)))
     def __setitem__(self,k,v): self.d[k] = str(v)
     def __contains__(self,k):  return k in self.d
     def save(self):            save_config_file(self.config_file,self.d)

fastcore/imports.py

@@ -29,7 +29,7 @@ def is_coll(o):
 
 def all_equal(a,b):
     "Compares whether `a` and `b` are the same length and have the same contents"
-    if not is_iter(b): return False
+    if not is_iter(b): return a==b
     return all(equals(a_,b_) for a_,b_ in itertools.zip_longest(a,b))
 
 def noop (x=None, *args, **kwargs):
@@ -49,7 +49,8 @@ def isinstance_str(x, cls_name):
 def array_equal(a,b):
     if hasattr(a, '__array__'): a = a.__array__()
     if hasattr(b, '__array__'): b = b.__array__()
-    return (a==b).all()
+    if isinstance_str(a, 'ndarray') and isinstance_str(b, 'ndarray'): return (a==b).all()
+    return all_equal(a,b)
 
 def df_equal(a,b): return a.equals(b) if isinstance_str(a, 'NDFrame') else b.equals(a)
 

fastcore/parallel.py

@@ -123,21 +123,21 @@ def add_one(x, a=1):
     time.sleep(random.random()/80)
     return x+a
 
-# %% ../nbs/03a_parallel.ipynb 22
+# %% ../nbs/03a_parallel.ipynb 21
 def run_procs(f, f_done, args):
     "Call `f` for each item in `args` in parallel, yielding `f_done`"
     processes = L(args).map(Process, args=arg0, target=f)
     for o in processes: o.start()
     yield from f_done()
     processes.map(Self.join())
 
-# %% ../nbs/03a_parallel.ipynb 23
+# %% ../nbs/03a_parallel.ipynb 22
 def _f_pg(obj, queue, batch, start_idx):
     for i,b in enumerate(obj(batch)): queue.put((start_idx+i,b))
 
 def _done_pg(queue, items): return (queue.get() for _ in items)
 
-# %% ../nbs/03a_parallel.ipynb 24
+# %% ../nbs/03a_parallel.ipynb 23
 def parallel_gen(cls, items, n_workers=defaults.cpus, **kwargs):
     "Instantiate `cls` in `n_workers` procs & call each on a subset of `items` in parallel."
     if not parallelable('n_workers', n_workers): n_workers = 0

fastcore/script.py

@@ -116,7 +116,7 @@ def _f(*args, **kwargs):
         return tfunc(**merge(args, args_from_prog(func, xtra)))
 
     mod = inspect.getmodule(inspect.currentframe().f_back)
-    if getattr(mod, __name__, '') =="__main__":
+    if getattr(mod, '__name__', '') =="__main__":
         setattr(mod, func.__name__, _f)
         SCRIPT_INFO.func = func.__name__
         return _f()

fastcore/xdg.py

@@ -1,72 +1,58 @@
-# Copyright © 2016-2021 Scott Stevenson <[email protected]>
-# Modifications copyright © 2022 onwards Jeremy Howard
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/09_xdg.ipynb.
 
-"""XDG Base Directory Specification variables.
+# %% auto 0
+__all__ = ['xdg_cache_home', 'xdg_config_dirs', 'xdg_config_home', 'xdg_data_dirs', 'xdg_data_home', 'xdg_runtime_dir',
+           'xdg_state_home']
 
-xdg_cache_home(), xdg_config_home(), xdg_data_home(), and xdg_state_home()
-return pathlib.Path objects containing the value of the environment variable
-named XDG_CACHE_HOME, XDG_CONFIG_HOME, XDG_DATA_HOME, and XDG_STATE_HOME
-respectively, or the default defined in the specification if the environment
-variable is unset, empty, or contains a relative path rather than absolute
-path.
+# %% ../nbs/09_xdg.ipynb 3
+from .utils import *
 
-xdg_config_dirs() and xdg_data_dirs() return a list of pathlib.Path
-objects containing the value, split on colons, of the environment
-variable named XDG_CONFIG_DIRS and XDG_DATA_DIRS respectively, or the
-default defined in the specification if the environment variable is
-unset or empty. Relative paths are ignored, as per the specification.
-
-xdg_runtime_dir() returns a pathlib.Path object containing the value of
-the XDG_RUNTIME_DIR environment variable, or None if the environment
-variable is not set, or contains a relative path rather than absolute path.
-"""
-
-import os
-from pathlib import Path
-from typing import List, Optional
-
-__all__ = [ "xdg_cache_home", "xdg_config_dirs", "xdg_config_home", "xdg_data_dirs", "xdg_data_home", "xdg_runtime_dir", "xdg_state_home",
-    "XDG_CACHE_HOME", "XDG_CONFIG_DIRS", "XDG_CONFIG_HOME", "XDG_DATA_DIRS", "XDG_DATA_HOME", "XDG_RUNTIME_DIR" ]
-
-
-def _path_from_env(variable: str, default: Path) -> Path:
+# %% ../nbs/09_xdg.ipynb 10
+def _path_from_env(variable, default):
     value = os.environ.get(variable)
     if value and os.path.isabs(value): return Path(value)
     return default
 
-def _paths_from_env(variable: str, default: List[Path]) -> List[Path]:
+# %% ../nbs/09_xdg.ipynb 11
+def _paths_from_env(variable, default):
     value = os.environ.get(variable)
     if value:
-        paths = [ Path(path) for path in value.split(":") if os.path.isabs(path) ]
+        paths = [Path(o) for o in value.split(":") if os.path.isabs(o)]
         if paths: return paths
     return default
 
-def xdg_cache_home() -> Path:
-    """Path corresponding to XDG_CACHE_HOME."""
+# %% ../nbs/09_xdg.ipynb 12
+def xdg_cache_home():
+    "Path corresponding to `XDG_CACHE_HOME`"
     return _path_from_env("XDG_CACHE_HOME", Path.home()/".cache")
 
-def xdg_config_dirs() -> List[Path]:
-    """Paths corresponding to XDG_CONFIG_DIRS."""
+# %% ../nbs/09_xdg.ipynb 15
+def xdg_config_dirs():
+    "Paths corresponding to `XDG_CONFIG_DIRS`"
     return _paths_from_env("XDG_CONFIG_DIRS", [Path("/etc/xdg")])
 
-def xdg_config_home() -> Path:
-    """Path corresponding to XDG_CONFIG_HOME."""
+# %% ../nbs/09_xdg.ipynb 17
+def xdg_config_home():
+    "Path corresponding to `XDG_CONFIG_HOME`"
     return _path_from_env("XDG_CONFIG_HOME", Path.home()/".config")
 
-def xdg_data_dirs() -> List[Path]:
-    """Paths corresponding to XDG_DATA_DIRS."""
-    return _paths_from_env( "XDG_DATA_DIRS", [Path(path) for path in "/usr/local/share/:/usr/share/".split(":")])
+# %% ../nbs/09_xdg.ipynb 19
+def xdg_data_dirs():
+    "Paths corresponding to XDG_DATA_DIRS`"
+    return _paths_from_env( "XDG_DATA_DIRS", [Path(o) for o in "/usr/local/share/:/usr/share/".split(":")])
 
-def xdg_data_home() -> Path:
-    """Path corresponding to XDG_DATA_HOME."""
+# %% ../nbs/09_xdg.ipynb 21
+def xdg_data_home():
+    "Path corresponding to `XDG_DATA_HOME`"
     return _path_from_env("XDG_DATA_HOME", Path.home()/".local"/"share")
 
-def xdg_runtime_dir() -> Optional[Path]:
-    """Path corresponding to XDG_RUNTIME_DIR. """
+# %% ../nbs/09_xdg.ipynb 23
+def xdg_runtime_dir():
+    "Path corresponding to `XDG_RUNTIME_DIR`"
     value = os.getenv("XDG_RUNTIME_DIR")
     return Path(value) if value and os.path.isabs(value) else None
 
-def xdg_state_home() -> Path:
-    """Path corresponding to XDG_STATE_HOME."""
+# %% ../nbs/09_xdg.ipynb 25
+def xdg_state_home():
+    "Path corresponding to `XDG_STATE_HOME`"
     return _path_from_env("XDG_STATE_HOME", Path.home()/".local"/"state")
-

nbs/.gitattributes

@@ -1,3 +1 @@
-**/*.ipynb filter=clean-nbs
-**/*.ipynb diff=ipynb
 *.ipynb merge=nbdev-merge