Fix common options in blockm, surface, histogram, rose, and grdtrack (#1519)

* Remove -g gap from histogram, rose

* Add -i incols to histogram

* Remove -s skiprows from blockm.py, surface

* Add -a aspatial to grdtrack

Co-authored-by: Dongdong Tian <[email protected]>

Co-authored-by: Dongdong Tian <[email protected]>

Author: Meghan Jones

pygmt/src/blockm.py

@@ -79,7 +79,6 @@ def _blockm(block_method, table, outfile, x, y, z, **kwargs):
     i="incols",
     o="outcols",
     r="registration",
-    s="skiprows",
     w="wrap",
 )
 @kwargs_to_strings(R="sequence", i="sequence_comma", o="sequence_comma")
@@ -126,7 +125,6 @@ def blockmean(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
     {h}
     {o}
     {r}
-    {s}
     {w}
 
     Returns
@@ -158,7 +156,6 @@ def blockmean(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
     i="incols",
     o="outcols",
     r="registration",
-    s="skiprows",
     w="wrap",
 )
 @kwargs_to_strings(R="sequence", i="sequence_comma", o="sequence_comma")
@@ -205,7 +202,6 @@ def blockmedian(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
     {i}
     {o}
     {r}
-    {s}
     {w}
 
     Returns
@@ -243,7 +239,6 @@ def blockmedian(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
     i="incols",
     o="outcols",
     r="registration",
-    s="skiprows",
     w="wrap",
 )
 @kwargs_to_strings(R="sequence", i="sequence_comma", o="sequence_comma")
@@ -290,7 +285,6 @@ def blockmode(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
     {i}
     {o}
     {r}
-    {s}
     {w}
 
     Returns

pygmt/src/grdtrack.py

@@ -26,6 +26,7 @@
     T="radius",
     V="verbose",
     Z="z_only",
+    a="aspatial",
     b="binary",
     d="nodata",
     e="find",
@@ -240,6 +241,7 @@ def grdtrack(points, grid, newcolname=None, outfile=None, **kwargs):
     {V}
     z_only : bool
         Only write out the sampled z-values [Default writes all columns].
+    {a}
     {b}
     {d}
     {e}

pygmt/src/histogram.py

@@ -31,14 +31,16 @@
     c="panel",
     d="nodata",
     e="find",
-    g="gap",
     h="header",
+    i="incols",
     l="label",
     p="perspective",
     t="transparency",
     w="wrap",
 )
-@kwargs_to_strings(R="sequence", T="sequence", c="sequence_comma", p="sequence")
+@kwargs_to_strings(
+    R="sequence", T="sequence", c="sequence_comma", i="sequence_comma", p="sequence"
+)
 def histogram(self, table, **kwargs):
     r"""
     Plots a histogram, and can read data from a file or
@@ -128,8 +130,8 @@ def histogram(self, table, **kwargs):
     {b}
     {d}
     {e}
-    {g}
     {h}
+    {i}
     {l}
     {p}
     {t}

pygmt/src/rose.py

@@ -39,7 +39,6 @@
     b="binary",
     d="nodata",
     e="find",
-    g="gap",
     h="header",
     i="incols",
     c="panel",
@@ -196,7 +195,6 @@ def rose(self, length=None, azimuth=None, data=None, **kwargs):
     {c}
     {d}
     {e}
-    {g}
     {h}
     {i}
     {p}

pygmt/src/surface.py

@@ -32,7 +32,6 @@
     h="header",
     i="incols",
     r="registration",
-    s="skiprows",
     w="wrap",
 )
 @kwargs_to_strings(R="sequence")
@@ -82,7 +81,6 @@ def surface(x=None, y=None, z=None, data=None, **kwargs):
     {h}
     {i}
     {r}
-    {s}
     {w}
 
     Returns