Bump loam version

Author: amorison

docs/conf.py

@@ -12,6 +12,7 @@
 
 import sys
 import os
+from dataclasses import fields
 from pathlib import Path
 from textwrap import dedent
 from pkg_resources import get_distribution
@@ -120,7 +121,8 @@
 
         These tables list configuration options.
         """))
-    for section in stagpy.conf.sections_():
+    for sec_fld in fields(stagpy.conf):
+        sec_name = sec_fld.name
         fid.write(dedent(
             """
             .. list-table:: {}
@@ -129,14 +131,17 @@
                * - Name
                  - Description
                  - CLI, config file?
-            """.format(section)))
-        for opt, meta in stagpy.conf[section].defaults_():
-            if meta.cmd_arg and meta.conf_arg:
+            """.format(sec_name)))
+        section = getattr(stagpy.conf, sec_name)
+        for fld in fields(section):
+            opt = fld.name
+            entry = section.meta_(opt).entry
+            if entry.in_cli and entry.in_file:
                 c_f = 'both'
-            elif meta.cmd_arg:
+            elif entry.in_cli:
                 c_f = 'CLI'
             else:
                 c_f = 'config file'
             fid.write('   * - {}\n'.format(opt))
-            fid.write('     - {}\n'.format(meta.help))
+            fid.write('     - {}\n'.format(entry.doc))
             fid.write('     - {}\n'.format(c_f))

setup.cfg

@@ -29,7 +29,7 @@ include_package_data = true
 packages =
     find:
 install_requires =
-    loam>=0.5.2,<0.6.0
+    loam>=0.6.0,<0.7.0
     f90nml>=1.3.1
     setuptools_scm>=6.3.2
     numpy>=1.19

stagpy/__init__.py

@@ -25,7 +25,6 @@
 import typing
 
 from setuptools_scm import get_version
-from loam.manager import ConfigurationManager
 
 from . import config, _styles
 
@@ -67,7 +66,7 @@ def _check_config() -> None:
     if not uptodate:
         verfile.write_text(__version__)
     if not (uptodate and config.CONFIG_FILE.is_file()):
-        conf.create_config_(update=True)
+        conf.to_file_(config.CONFIG_FILE)
     for stfile in _iter_styles():
         stfile_conf = config.CONFIG_DIR / stfile
         if not (uptodate and stfile_conf.is_file()):
@@ -89,13 +88,12 @@ def _check_config() -> None:
     except ImportError:
         __version__ = "unknown"
 
-_CONF_FILES = ([config.CONFIG_FILE, config.CONFIG_LOCAL]
-               if not ISOLATED else [])
-conf = ConfigurationManager.from_dict_(config.CONF_DEF)
-conf.set_config_files_(*_CONF_FILES)
+conf = config.Config.default_()
 if not ISOLATED:
     _check_config()
-PARSING_OUT = conf.read_configs_()
+    conf.update_from_file_(config.CONFIG_FILE)
+    if config.CONFIG_LOCAL.is_file():
+        conf.update_from_file_(config.CONFIG_LOCAL)
 
 if not DEBUG:
     signal.signal(signal.SIGINT, _PREV_INT)

stagpy/args.py

@@ -6,13 +6,13 @@
 import importlib.resources as imlr
 import typing
 
-from loam.tools import set_conf_str, create_complete_files
+from loam.tools import create_complete_files
 from loam.cli import Subcmd, CLIManager
 import matplotlib.pyplot as plt
 import matplotlib.style as mpls
 
 from . import __doc__ as doc_module
-from . import conf, PARSING_OUT, ISOLATED
+from . import conf, ISOLATED
 from . import (
     commands, config, field, rprof, time_series, refstate, plates, _styles,
 )
@@ -91,12 +91,6 @@ def parse_args(arglist: Optional[List[str]] = None) -> Callable[[], None]:
     if sub_cmd is None:
         return cmd_args.func
 
-    if sub_cmd != 'config':
-        commands.report_parsing_problems(PARSING_OUT)
-
-    if conf.common.set:
-        set_conf_str(conf, conf.common.set)
-
     if conf.common.config:
         commands.config_pp(climan.sections_list(sub_cmd))
 

stagpy/commands.py

@@ -1,25 +1,25 @@
 """Definition of non-processing subcommands."""
 
 from __future__ import annotations
+from dataclasses import fields
 from itertools import zip_longest
 from math import ceil
 from shutil import get_terminal_size
 from textwrap import indent, TextWrapper
-import sys
 import typing
 
 import loam.tools
 import pandas
 
 from . import conf, phyvars, __version__
 from . import stagyydata
-from .config import CONFIG_FILE, CONFIG_LOCAL
+from .config import CONFIG_FILE
 from ._helpers import baredoc
 
 if typing.TYPE_CHECKING:
     from typing import (Sequence, Tuple, Optional, Mapping, Callable, Union,
-                        Iterable, Any)
-    from pathlib import Path
+                        Iterable)
+    from loam.base import Section
     from .datatypes import Varf, Varr, Vart
 
 
@@ -131,7 +131,8 @@ def var_cmd() -> None:
     See :mod:`stagpy.phyvars` where the lists of variables organized by command
     are defined.
     """
-    print_all = not any(val for _, val in conf.var.opt_vals_())
+    print_all = not any(getattr(conf.var, fld.name)
+                        for fld in fields(conf.var))
     if print_all or conf.var.field:
         print('field:')
         _layout(phyvars.FIELD, phyvars.FIELD_EXTRA)
@@ -162,22 +163,6 @@ def version_cmd() -> None:
     print(f'stagpy version: {__version__}')
 
 
-def report_parsing_problems(
-        parsing_out: Tuple[Any, Sequence[Path], Sequence[Path]]) -> None:
-    """Output message about potential parsing problems."""
-    _, empty, faulty = parsing_out
-    if CONFIG_FILE in empty or CONFIG_FILE in faulty:
-        print('Unable to read global config file', CONFIG_FILE,
-              file=sys.stderr)
-        print('Please run stagpy config --create',
-              sep='\n', end='\n\n', file=sys.stderr)
-    if CONFIG_LOCAL in faulty:
-        print('Unable to read local config file', CONFIG_LOCAL,
-              file=sys.stderr)
-        print('Please run stagpy config --create_local',
-              sep='\n', end='\n\n', file=sys.stderr)
-
-
 def config_pp(subs: Iterable[str]) -> None:
     """Pretty print of configuration options.
 
@@ -187,11 +172,14 @@ def config_pp(subs: Iterable[str]) -> None:
     print('(c|f): available only as CLI argument/in the config file',
           end='\n\n')
     for sub in subs:
+        section: Section = getattr(conf, sub)
         hlp_lst = []
-        for opt, meta in conf[sub].defaults_():
-            if meta.cmd_arg ^ meta.conf_arg:
-                opt += ' (c)' if meta.cmd_arg else ' (f)'
-            hlp_lst.append((opt, meta.help))
+        for fld in fields(section):
+            opt = fld.name
+            entry = section.meta_(opt).entry
+            if entry.in_cli ^ entry.in_file:
+                opt += ' (c)' if entry.in_cli else ' (f)'
+            hlp_lst.append((opt, entry.doc))
         if hlp_lst:
             print(f'{sub}:')
             _pretty_print(hlp_lst, sep=' -- ',
@@ -206,7 +194,6 @@ def config_cmd() -> None:
         conf.config
     """
     if not (conf.common.config or conf.config.create or
-            conf.config.create_local or conf.config.update or
-            conf.config.edit):
-        config_pp(conf.sections_())
-    loam.tools.config_cmd_handler(conf)
+            conf.config.update or conf.config.edit):
+        config_pp(sec.name for sec in fields(conf))
+    loam.tools.config_cmd_handler(conf, conf.config, CONFIG_FILE)