do not raise if missing config

Author: jph00

nbdev/config.py

@@ -209,19 +209,24 @@ def _user_config():
     return {}
 
 # %% ../nbs/api/01_config.ipynb #f6660849
-@functools.lru_cache(maxsize=None)
-def get_config(path=None):
+def get_config(path=None, also_settings=False):
     "Return nbdev config."
     cfg_file = _find_nbdev_pyproject(path)
-    if cfg_file is None: raise FileNotFoundError("No pyproject.toml with [tool.nbdev] found")
-    # Check for old settings.ini and complain loudly
-    old_cfg = cfg_file.parent / 'settings.ini'
-    if old_cfg.exists():
-        raise ValueError(f"Found old settings.ini at {old_cfg}. Please migrate to pyproject.toml using `nbdev_migrate`")
-    d = _load_toml(cfg_file)
-    user = _user_config()
-    nbdev = {**user, **d.get('tool', {}).get('nbdev', {})}  # project overrides user
-    return ConfigToml(nbdev, d.get('project', {}), cfg_file)
+    if cfg_file is not None:
+        # Check for old settings.ini and complain loudly
+        old_cfg = cfg_file.parent / 'settings.ini'
+        if old_cfg.exists() and not also_settings:
+            raise ValueError(f"Found old settings.ini at {old_cfg}. Please migrate to pyproject.toml using `nbdev_migrate`")
+        d = _load_toml(cfg_file)
+        user = _user_config()
+        nbdev = {**user, **d.get('tool', {}).get('nbdev', {})}
+        return ConfigToml(nbdev, d.get('project', {}), cfg_file)
+    if also_settings:
+        from fastcore.foundation import Config
+        cfg = Config.find('settings.ini', path)
+        if cfg: return cfg
+    cfg_path = Path(path or Path.cwd()).expanduser().absolute()
+    return ConfigToml(nbdev_defaults, {}, cfg_path/'pyproject.toml')
 
 # %% ../nbs/api/01_config.ipynb #6939b40e
 def is_nbdev(path=None): return _find_nbdev_pyproject(path) is not None

nbdev/doclinks.py

@@ -229,7 +229,7 @@ def _qual_syms(entries):
 # %% ../nbs/api/05_doclinks.ipynb #3a24b883
 @lru_cache(None)
 def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):
-    cfg = get_config()
+    cfg = get_config(also_settings=True)
     if strip_libs is None:
         try: strip_libs = cfg.get('strip_libs') or cfg.lib_name
         except FileNotFoundError: strip_libs = 'nbdev'

nbdev/migrate.py

@@ -204,7 +204,7 @@ def nbdev_migrate_config(path:str='.'):  # Project root containing settings.ini
     set_version(path/lib_path, d.get('version', '0.0.1'))
     lib_name = d.get('lib_name', repo)
     txt = pyproject_tmpl.format(name=lib_name, lib_path=lib_path, description=d.get('description', ''),
-        min_python=d.get('min_python', '3.9'), license=_license_map.get(d.get('license', ''), d.get('license', 'Apache-2.0')),
+        min_python=d.get('min_python', '3.10'), license=_license_map.get(d.get('license', ''), d.get('license', 'Apache-2.0')),
         author=d.get('author', ''), author_email=d.get('author_email', ''),
         keywords=d.get('keywords', 'nbdev').split(), git_url=git_url, doc_url=doc_url, branch=branch)
     # Add dependencies (combine requirements + pip_requirements)

nbs/api/01_config.ipynb

@@ -421,19 +421,24 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "@functools.lru_cache(maxsize=None)\n",
-    "def get_config(path=None):\n",
+    "def get_config(path=None, also_settings=False):\n",
     "    \"Return nbdev config.\"\n",
     "    cfg_file = _find_nbdev_pyproject(path)\n",
-    "    if cfg_file is None: raise FileNotFoundError(\"No pyproject.toml with [tool.nbdev] found\")\n",
-    "    # Check for old settings.ini and complain loudly\n",
-    "    old_cfg = cfg_file.parent / 'settings.ini'\n",
-    "    if old_cfg.exists():\n",
-    "        raise ValueError(f\"Found old settings.ini at {old_cfg}. Please migrate to pyproject.toml using `nbdev_migrate`\")\n",
-    "    d = _load_toml(cfg_file)\n",
-    "    user = _user_config()\n",
-    "    nbdev = {**user, **d.get('tool', {}).get('nbdev', {})}  # project overrides user\n",
-    "    return ConfigToml(nbdev, d.get('project', {}), cfg_file)"
+    "    if cfg_file is not None:\n",
+    "        # Check for old settings.ini and complain loudly\n",
+    "        old_cfg = cfg_file.parent / 'settings.ini'\n",
+    "        if old_cfg.exists() and not also_settings:\n",
+    "            raise ValueError(f\"Found old settings.ini at {old_cfg}. Please migrate to pyproject.toml using `nbdev_migrate`\")\n",
+    "        d = _load_toml(cfg_file)\n",
+    "        user = _user_config()\n",
+    "        nbdev = {**user, **d.get('tool', {}).get('nbdev', {})}\n",
+    "        return ConfigToml(nbdev, d.get('project', {}), cfg_file)\n",
+    "    if also_settings:\n",
+    "        from fastcore.foundation import Config\n",
+    "        cfg = Config.find('settings.ini', path)\n",
+    "        if cfg: return cfg\n",
+    "    cfg_path = Path(path or Path.cwd()).expanduser().absolute()\n",
+    "    return ConfigToml(nbdev_defaults, {}, cfg_path/'pyproject.toml')"
    ]
   },
   {

nbs/api/05_doclinks.ipynb

@@ -651,7 +651,7 @@
     "#| export\n",
     "@lru_cache(None)\n",
     "def _build_lookup_table(strip_libs=None, incl_libs=None, skip_mods=None):\n",
-    "    cfg = get_config()\n",
+    "    cfg = get_config(also_settings=True)\n",
     "    if strip_libs is None:\n",
     "        try: strip_libs = cfg.get('strip_libs') or cfg.lib_name\n",
     "        except FileNotFoundError: strip_libs = 'nbdev'\n",