Bump loam to 0.7.0

Author: amorison

setup.cfg

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

stagpy/args.py

@@ -6,7 +6,6 @@
 import importlib.resources as imlr
 import typing
 
-from loam.tools import create_complete_files
 from loam.cli import Subcmd, CLIManager
 import matplotlib.pyplot as plt
 import matplotlib.style as mpls
@@ -37,20 +36,19 @@ def _bare_cmd() -> None:
 
 def _load_mplstyle() -> None:
     """Try to load conf.plot.mplstyle matplotlib style."""
-    if conf.plot.mplstyle:
-        for style in conf.plot.mplstyle.split():
-            style_fname = style + ".mplstyle"
-            if not ISOLATED:
-                stfile = config.CONFIG_DIR / style_fname
-                if stfile.is_file():
-                    mpls.use(str(stfile))
-                    continue
-            # try packaged version
-            if imlr.is_resource(_styles, style_fname):
-                with imlr.path(_styles, style_fname) as stfile:
-                    mpls.use(str(stfile))
-                    continue
-            mpls.use(style)
+    for style in conf.plot.mplstyle:
+        style_fname = style + ".mplstyle"
+        if not ISOLATED:
+            stfile = config.CONFIG_DIR / style_fname
+            if stfile.is_file():
+                mpls.use(str(stfile))
+                continue
+        # try packaged version
+        if imlr.is_resource(_styles, style_fname):
+            with imlr.path(_styles, style_fname) as stfile:
+                mpls.use(str(stfile))
+                continue
+        mpls.use(style)
     if conf.plot.xkcd:
         plt.xkcd()
 
@@ -83,7 +81,12 @@ def parse_args(arglist: Optional[List[str]] = None) -> Callable[[], None]:
     """
     climan = CLIManager(conf, **SUB_CMDS)
 
-    create_complete_files(climan, CONFIG_DIR, 'stagpy', zsh_sourceable=True)
+    bash_script = CONFIG_DIR / "bash" / "stagpy.sh"
+    bash_script.parent.mkdir(parents=True, exist_ok=True)
+    climan.bash_complete(bash_script, "stagpy")
+    zsh_script = CONFIG_DIR / "zsh" / "_stagpy.sh"
+    zsh_script.parent.mkdir(parents=True, exist_ok=True)
+    climan.zsh_complete(zsh_script, "stagpy", sourceable=True)
 
     cmd_args = climan.parse_args(arglist)
     sub_cmd = cmd_args.loam_sub_name

stagpy/config.py

@@ -10,13 +10,13 @@
 from typing import Sequence, Union, Optional, Dict
 
 from loam.base import entry, Section, ConfigBase
+from loam.collections import TupleEntry, MaybeEntry
 from loam import tools
 from loam.tools import switch_opt, command_flag, path_entry
-import loam.parsers
+import loam.parsers as lprs
 
 
-_index_collection = loam.parsers.tuple_of(loam.parsers.slice_or_int_parser)
-_float_list = loam.parsers.tuple_of(float)
+_indices = TupleEntry(inner_from_toml=lprs.slice_or_int_parser)
 
 HOME_DIR = Path.home()
 CONFIG_DIR = HOME_DIR / '.config' / 'stagpy'
@@ -41,40 +41,29 @@ class Core(Section):
                          doc='output file name prefix')
     shortname: bool = switch_opt(
         False, None, "output file name is only prefix")
-    timesteps: Optional[Sequence[Union[int, slice]]] = entry(
-        val_factory=lambda: None, cli_short='t', in_file=False,
-        doc="timesteps slice",
-        cli_kwargs={'nargs': '?', 'const': ''}, from_str=_index_collection)
-    snapshots: Optional[Sequence[Union[int, slice]]] = entry(
-        val_factory=lambda: None, cli_short='s', in_file=False,
-        doc="snapshots slice",
-        cli_kwargs={'nargs': '?', 'const': ''}, from_str=_index_collection)
+    timesteps: Sequence[Union[int, slice]] = _indices.entry(
+        doc="timesteps slice", in_file=False, cli_short="t")
+    snapshots: Sequence[Union[int, slice]] = _indices.entry(
+        default=[-1], doc="snapshots slice", in_file=False, cli_short='s')
 
 
 @dataclass
 class Plot(Section):
     """Options to tweak plots."""
 
-    ratio: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="force aspect ratio of field plot",
-        cli_kwargs={'nargs': '?', 'const': 0.6})
+    ratio: Optional[float] = MaybeEntry(float).entry(
+        doc="force aspect ratio of field plot", in_file=False)
     raster: bool = switch_opt(True, None, "rasterize field plots")
     format: str = entry(val="pdf", doc="figure format (pdf, eps, svg, png)")
-    vmin: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="minimal value on plot")
-    vmax: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="maximal value on plot")
+    vmin: Optional[float] = MaybeEntry(float).entry(
+        doc="minimal value on plot", in_file=False)
+    vmax: Optional[float] = MaybeEntry(float).entry(
+        doc="maximal value on plot", in_file=False)
     cminmax: bool = switch_opt(False, 'C', 'constant min max across plots')
-    isolines: Optional[Sequence[float]] = entry(
-        val_factory=lambda: None, in_file=False, from_str=_float_list,
-        doc="arbitrary isoline value, comma separated")
-    mplstyle: str = entry(
-        val="stagpy-paper", in_file=False,
-        cli_kwargs={'nargs': '?', 'const': ''},
-        doc="matplotlib style")
+    isolines: Sequence[float] = TupleEntry(float).entry(
+        doc="list of isoline values", in_file=False)
+    mplstyle: Sequence[str] = TupleEntry(str).entry(
+        default="stagpy-paper", doc="list of matplotlib styles", in_file=False)
     xkcd: bool = command_flag("use the xkcd style")
 
 
@@ -104,23 +93,19 @@ class Field(Section):
         doc="variables to plot (see stagpy var)")
     perturbation: bool = switch_opt(
         False, None, "plot departure from average profile")
-    shift: Optional[int] = entry(
-        val_factory=lambda: None, in_file=False, from_str=int,
-        doc="shift plot horizontally")
+    shift: Optional[int] = MaybeEntry(int).entry(
+        doc="shift plot horizontally", in_file=False)
     timelabel: bool = switch_opt(False, None, "add label with time")
     interpolate: bool = switch_opt(False, None, "apply Gouraud shading")
     colorbar: bool = switch_opt(True, None, "add color bar to plot")
-    ix: Optional[int] = entry(
-        val_factory=lambda: None, in_file=False, from_str=int,
-        doc="x-index of slice for 3D fields")
-    iy: Optional[int] = entry(
-        val_factory=lambda: None, in_file=False, from_str=int,
-        doc="y-index of slice for 3D fields")
-    iz: Optional[int] = entry(
-        val_factory=lambda: None, in_file=False, from_str=int,
-        doc="z-index of slice for 3D fields")
-    isocolors: str = entry(
-        val="", doc="comma-separated list of colors for isolines")
+    ix: Optional[int] = MaybeEntry(int).entry(
+        doc="x-index of slice for 3D fields", in_file=False)
+    iy: Optional[int] = MaybeEntry(int).entry(
+        doc="y-index of slice for 3D fields", in_file=False)
+    iz: Optional[int] = MaybeEntry(int).entry(
+        doc="z-index of slice for 3D fields", in_file=False)
+    isocolors: Sequence[str] = TupleEntry(str).entry(
+        doc="list of colors for isolines")
     cmap: Dict[str, str] = entry(
         val_factory=lambda: {
             'T': 'RdBu_r',
@@ -154,28 +139,20 @@ class Time(Section):
         cli_kwargs={'nargs': '?', 'const': ''},
         doc="variables to plot (see stagpy var)")
     style: str = entry(val='-', doc="matplotlib line style")
-    compstat: str = entry(
-        val='', in_file=False,
-        cli_kwargs={'nargs': '?', 'const': ''},
-        doc="compute mean and rms of listed variables")
-    tstart: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="beginning time")
-    tend: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="end time")
-    fraction: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="ending fraction of series to process")
-    marktimes: Sequence[float] = entry(
-        val_str="", in_file=False, cli_short='M', from_str=_float_list,
-        doc="list of times where to put a mark")
-    marksteps: Sequence[Union[int, slice]] = entry(
-        val_str="", cli_short='T', in_file=False, from_str=_index_collection,
-        doc="list of steps where to put a mark")
-    marksnaps: Sequence[Union[int, slice]] = entry(
-        val_str="", cli_short='S', in_file=False, from_str=_index_collection,
-        doc="list of snaps where to put a mark")
+    compstat: Sequence[str] = TupleEntry(str).entry(
+        doc="compute mean and rms of listed variables", in_file=False)
+    tstart: Optional[float] = MaybeEntry(float).entry(
+        doc="beginning time", in_file=False)
+    tend: Optional[float] = MaybeEntry(float).entry(
+        doc="end time", in_file=False)
+    fraction: Optional[float] = MaybeEntry(float).entry(
+        doc="ending fraction of series to process", in_file=False)
+    marktimes: Sequence[float] = TupleEntry(float).entry(
+        doc="list of times where to put a mark", in_file=False, cli_short='M')
+    marksteps: Sequence[Union[int, slice]] = _indices.entry(
+        doc="list of steps where to put a mark", in_file=False, cli_short='T')
+    marksnaps: Sequence[Union[int, slice]] = _indices.entry(
+        doc="list of snaps where to put a mark", in_file=False, cli_short='S')
 
 
 @dataclass
@@ -207,9 +184,8 @@ class Plates(Section):
         False, None, "plot number of plates as function of time")
     distribution: bool = switch_opt(
         False, None, "plot plate size distribution")
-    zoom: Optional[float] = entry(
-        val_factory=lambda: None, in_file=False, from_str=float,
-        doc="zoom around surface")
+    zoom: Optional[float] = MaybeEntry(float).entry(
+        doc="zoom around surface", in_file=False)
 
 
 @dataclass

stagpy/field.py

@@ -285,7 +285,7 @@ def plot_iso(axis: Axes, step: Step, var: str,
         fld = np.roll(fld, conf.field.shift, axis=0)
     extra_opts: Dict[str, Any] = dict(linewidths=1)
     if 'cmap' not in extra and conf.field.isocolors:
-        extra_opts['colors'] = conf.field.isocolors.split(',')
+        extra_opts['colors'] = conf.field.isocolors
     elif 'colors' not in extra:
         extra_opts['cmap'] = conf.field.cmap.get(var)
     if conf.plot.isolines:

stagpy/stagyydata.py

@@ -823,11 +823,9 @@ def walk(self) -> _StepsView:
             conf.core.snapshots: the slice of snapshots.
             conf.core.timesteps: the slice of timesteps.
         """
-        if conf.core.snapshots:
-            return self.snaps[conf.core.snapshots]
-        elif conf.core.timesteps:
+        if conf.core.timesteps:
             return self.steps[conf.core.timesteps]
-        return self.snaps[-1, ]
+        return self.snaps[conf.core.snapshots]
 
     @property
     def nfields_max(self) -> Optional[int]:

stagpy/time_series.py

@@ -136,7 +136,6 @@ def cmd() -> None:
     plot_time_series(sdat, conf.time.plot)
 
     if conf.time.compstat:
-        names = conf.time.compstat.replace(',', ' ').split()
-        stats = compstat(sdat, *names, tstart=conf.time.tstart,
+        stats = compstat(sdat, *conf.time.compstat, tstart=conf.time.tstart,
                          tend=conf.time.tend)
         stats.to_csv('statistics.dat')