Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 19, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4fe5480
Fix kwargs_to_strings for blockmedian and blockmode
Sep 17, 2021
057865f
Fix kwargs_to_strings for grdtrack
Sep 17, 2021
89beb36
Merge branch 'main' into update-common-strings
Sep 17, 2021
e8b6a57
Remove -g gap from histogram
Sep 17, 2021
373a606
Add -i incols to histogram
Sep 17, 2021
dcdfa3d
Remove -g gap from rose
Sep 17, 2021
6acc507
Remove -s skiprows from blockm.py
Sep 17, 2021
444d313
Fix kwargs_to_strings in blockmode
Sep 17, 2021
81d472d
Remove -s from surface
Sep 17, 2021
1c7898b
Add -a aspatial to grdtrack
Sep 17, 2021
401bda2
Revert outcols sequence_comma commits
Sep 19, 2021
d52f2c8
Merge branch 'main' into update-common-strings
Sep 19, 2021
84c4608
Update kwargs_to_strings in histogram
Sep 19, 2021
01e180d
Merge branch 'main' into update-common-strings
Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pygmt/src/blockm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -126,7 +125,6 @@ def blockmean(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
{h}
{o}
{r}
{s}
{w}

Returns
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -205,7 +202,6 @@ def blockmedian(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
{i}
{o}
{r}
{s}
{w}

Returns
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -290,7 +285,6 @@ def blockmode(table=None, outfile=None, *, x=None, y=None, z=None, **kwargs):
{i}
{o}
{r}
{s}
{w}

Returns
Expand Down
2 changes: 2 additions & 0 deletions pygmt/src/grdtrack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
T="radius",
V="verbose",
Z="z_only",
a="aspatial",
b="binary",
d="nodata",
e="find",
Expand Down Expand Up @@ -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}
Expand Down
8 changes: 5 additions & 3 deletions pygmt/src/histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -128,8 +130,8 @@ def histogram(self, table, **kwargs):
{b}
{d}
{e}
{g}
{h}
{i}
{l}
{p}
{t}
Expand Down
2 changes: 0 additions & 2 deletions pygmt/src/rose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
b="binary",
d="nodata",
e="find",
g="gap",
h="header",
i="incols",
c="panel",
Expand Down Expand Up @@ -196,7 +195,6 @@ def rose(self, length=None, azimuth=None, data=None, **kwargs):
{c}
{d}
{e}
{g}
{h}
{i}
{p}
Expand Down
2 changes: 0 additions & 2 deletions pygmt/src/surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
h="header",
i="incols",
r="registration",
s="skiprows",
w="wrap",
)
@kwargs_to_strings(R="sequence")
Expand Down Expand Up @@ -82,7 +81,6 @@ def surface(x=None, y=None, z=None, data=None, **kwargs):
{h}
{i}
{r}
{s}
{w}

Returns
Expand Down