Merge branch 'main' into feature/direction_rose

Author: seisman

doc/techref/common_parameters.md

@@ -22,13 +22,13 @@
 ``verbose``
     Select verbosity level, which modulates the messages written to stderr.
 
-    Choose among 7 levels of verbosity [Default is ``"w"``]:
+    Choose among 7 levels of verbosity [Default is ``"warning"``]:
 
-    - ``"q"``: Quiet, not even fatal error messages are produced
-    - ``"e"``: Error messages only
-    - ``"w"``: Warnings [Default]
-    - ``"t"``: Timings (report runtimes for time-intensive algorithms)
-    - ``"i"``: Informational messages (same as ``verbose=True``)
-    - ``"c"``: Compatibility warnings
-    - ``"d"``: Debugging messages
+    - ``"quiet"``: Quiet, not even fatal error messages are produced
+    - ``"error"``: Error messages only
+    - ``"warning"``: Warnings [Default]
+    - ``"timing"``: Timings (report runtimes for time-intensive algorithms)
+    - ``"info"``: Informational messages (same as ``verbose=True``)
+    - ``"compat"``: Compatibility warnings
+    - ``"debug"``: Debugging messages
 ```

pygmt/alias.py

@@ -217,7 +217,14 @@ class AliasSystem(UserDict):
     >>> from pygmt.helpers import build_arg_list
     >>>
     >>> def func(
-    ...     par0, par1=None, par2=None, frame=False, repeat=None, panel=None, **kwargs
+    ...     par0,
+    ...     par1=None,
+    ...     par2=None,
+    ...     frame=False,
+    ...     repeat=None,
+    ...     panel=None,
+    ...     verbose=None,
+    ...     **kwargs,
     ... ):
     ...     aliasdict = AliasSystem(
     ...         A=[
@@ -227,6 +234,7 @@ class AliasSystem(UserDict):
     ...         B=Alias(frame, name="frame"),
     ...         D=Alias(repeat, name="repeat"),
     ...     ).add_common(
+    ...         V=verbose,
     ...         c=panel,
     ...     )
     ...     aliasdict.merge(kwargs)
@@ -238,9 +246,10 @@ class AliasSystem(UserDict):
     ...     frame=True,
     ...     repeat=[1, 2, 3],
     ...     panel=(1, 2),
+    ...     verbose="debug",
     ...     J="X10c/10c",
     ... )
-    ['-Amytext+o12/12', '-B', '-D1', '-D2', '-D3', '-JX10c/10c', '-c1,2']
+    ['-Amytext+o12/12', '-B', '-D1', '-D2', '-D3', '-JX10c/10c', '-Vd', '-c1,2']
     """
 
     def __init__(self, **kwargs):
@@ -276,10 +285,26 @@ def add_common(self, **kwargs):
         """
         for key, value in kwargs.items():
             match key:
+                case "V":
+                    alias = Alias(
+                        value,
+                        name="verbose",
+                        mapping={
+                            "quiet": "q",
+                            "error": "e",
+                            "warning": "w",
+                            "timing": "t",
+                            "info": "i",
+                            "compat": "c",
+                            "debug": "d",
+                        },
+                    )
                 case "J":
                     alias = Alias(value, name="projection")
                 case "c":
                     alias = Alias(value, name="panel", sep=",", size=2)
+                case "t":
+                    alias = Alias(value, name="transparency")
                 case _:
                     raise GMTValueError(key, description="common parameter")
             self.aliasdict[key] = alias

pygmt/src/basemap.py

@@ -3,6 +3,7 @@
 """
 
 import warnings
+from typing import Literal
 
 from pygmt.alias import AliasSystem
 from pygmt.clib import Session
@@ -19,14 +20,18 @@
     F="box",
     Td="rose",
     Tm="compass",
-    V="verbose",
     f="coltypes",
     p="perspective",
-    t="transparency",
 )
 @kwargs_to_strings(R="sequence", p="sequence")
 def basemap(
-    self, projection=None, panel: int | tuple[int, int] | bool = False, **kwargs
+    self,
+    projection=None,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
+    panel: int | tuple[int, int] | bool = False,
+    transparency: float | None = None,
+    **kwargs,
 ):
     r"""
     Plot base maps and frames.
@@ -43,7 +48,9 @@ def basemap(
 
     {aliases}
        - J = projection
+       - V = verbose
        - c = panel
+       - t = transparency
 
     Parameters
     ----------
@@ -102,7 +109,9 @@ def basemap(
 
     aliasdict = AliasSystem().add_common(
         J=projection,
+        V=verbose,
         c=panel,
+        t=transparency,
     )
     aliasdict.merge(kwargs)
 

pygmt/src/binstats.py

@@ -18,7 +18,6 @@
     N="normalize",
     R="region",
     S="search_radius",
-    V="verbose",
     W="weight",
     a="aspatial",
     b="binary",
@@ -49,6 +48,8 @@ def binstats(
         "sum",
     ] = "number",
     quantile_value: float = 50,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
     **kwargs,
 ) -> xr.DataArray | None:
     r"""
@@ -66,6 +67,7 @@ def binstats(
 
     {aliases}
        - C = statistic
+       - V = verbose
 
     Parameters
     ----------
@@ -151,7 +153,10 @@ def binstats(
                 "sum": "z",
             },
         ),
-    ).merge(kwargs)
+    ).add_common(
+        V=verbose,
+    )
+    aliasdict.merge(kwargs)
     if statistic == "quantile":
         aliasdict["C"] += f"{quantile_value}"
 

pygmt/src/blockm.py

@@ -7,6 +7,7 @@
 import numpy as np
 import pandas as pd
 from pygmt._typing import PathLike, TableLike
+from pygmt.alias import AliasSystem
 from pygmt.clib import Session
 from pygmt.helpers import (
     build_arg_list,
@@ -74,7 +75,6 @@ def _blockm(
     I="spacing",
     R="region",
     S="summary",
-    V="verbose",
     a="aspatial",
     b="binary",
     d="nodata",
@@ -94,6 +94,8 @@ def blockmean(
     z=None,
     output_type: Literal["pandas", "numpy", "file"] = "pandas",
     outfile: PathLike | None = None,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
     **kwargs,
 ) -> pd.DataFrame | np.ndarray | None:
     r"""
@@ -111,6 +113,7 @@ def blockmean(
     Full GMT docs at :gmt-docs:`blockmean.html`.
 
     {aliases}
+       - V = verbose
 
     Parameters
     ----------
@@ -162,6 +165,11 @@ def blockmean(
     >>> # Calculate block mean values within 5 by 5 arc-minute bins
     >>> data_bmean = pygmt.blockmean(data=data, region=[245, 255, 20, 30], spacing="5m")
     """
+    aliasdict = AliasSystem().add_common(
+        V=verbose,
+    )
+    aliasdict.merge(kwargs)
+
     return _blockm(
         block_method="blockmean",
         data=data,
@@ -170,15 +178,14 @@ def blockmean(
         z=z,
         output_type=output_type,
         outfile=outfile,
-        **kwargs,
+        **aliasdict,
     )
 
 
 @fmt_docstring
 @use_alias(
     I="spacing",
     R="region",
-    V="verbose",
     a="aspatial",
     b="binary",
     d="nodata",
@@ -198,6 +205,8 @@ def blockmedian(
     z=None,
     output_type: Literal["pandas", "numpy", "file"] = "pandas",
     outfile: PathLike | None = None,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
     **kwargs,
 ) -> pd.DataFrame | np.ndarray | None:
     r"""
@@ -215,6 +224,7 @@ def blockmedian(
     Full GMT docs at :gmt-docs:`blockmedian.html`.
 
     {aliases}
+       - V = verbose
 
     Parameters
     ----------
@@ -260,6 +270,11 @@ def blockmedian(
     ...     data=data, region=[245, 255, 20, 30], spacing="5m"
     ... )
     """
+    aliasdict = AliasSystem().add_common(
+        V=verbose,
+    )
+    aliasdict.merge(kwargs)
+
     return _blockm(
         block_method="blockmedian",
         data=data,
@@ -268,15 +283,14 @@ def blockmedian(
         z=z,
         output_type=output_type,
         outfile=outfile,
-        **kwargs,
+        **aliasdict,
     )
 
 
 @fmt_docstring
 @use_alias(
     I="spacing",
     R="region",
-    V="verbose",
     a="aspatial",
     b="binary",
     d="nodata",
@@ -296,6 +310,8 @@ def blockmode(
     z=None,
     output_type: Literal["pandas", "numpy", "file"] = "pandas",
     outfile: PathLike | None = None,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
     **kwargs,
 ) -> pd.DataFrame | np.ndarray | None:
     r"""
@@ -313,6 +329,7 @@ def blockmode(
     Full GMT docs at :gmt-docs:`blockmode.html`.
 
     {aliases}
+       - V = verbose
 
     Parameters
     ----------
@@ -356,6 +373,11 @@ def blockmode(
     >>> # Calculate block mode values within 5 by 5 arc-minute bins
     >>> data_bmode = pygmt.blockmode(data=data, region=[245, 255, 20, 30], spacing="5m")
     """
+    aliasdict = AliasSystem().add_common(
+        V=verbose,
+    )
+    aliasdict.merge(kwargs)
+
     return _blockm(
         block_method="blockmode",
         data=data,
@@ -364,5 +386,5 @@ def blockmode(
         z=z,
         output_type=output_type,
         outfile=outfile,
-        **kwargs,
+        **aliasdict,
     )

pygmt/src/coast.py

@@ -31,10 +31,8 @@
     N="borders",
     R="region",
     S="water",
-    V="verbose",
     W="shorelines",
     p="perspective",
-    t="transparency",
 )
 @kwargs_to_strings(R="sequence", p="sequence")
 def coast(
@@ -43,7 +41,10 @@ def coast(
     resolution: Literal[
         "auto", "full", "high", "intermediate", "low", "crude", None
     ] = None,
+    verbose: Literal["quiet", "error", "warning", "timing", "info", "compat", "debug"]
+    | bool = False,
     panel: int | tuple[int, int] | bool = False,
+    transparency: float | None = None,
     **kwargs,
 ):
     r"""
@@ -68,7 +69,9 @@ def coast(
     {aliases}
        - D = resolution
        - J = projection
+       - V = verbose
        - c = panel
+       - t = transparency
 
     Parameters
     ----------
@@ -229,7 +232,9 @@ def coast(
         ),
     ).add_common(
         J=projection,
+        V=verbose,
         c=panel,
+        t=transparency,
     )
     aliasdict.merge(kwargs)