Skip to content
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.

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

Update the doc strings in the non-plotting modules #882

Merged
merged 26 commits into from
Feb 14, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6b79637
Update doc strings for makecpt.py
willschlitzer Feb 13, 2021
9069441
Update doc strings for savefig in figure.py
willschlitzer Feb 13, 2021
b83b210
Update doc strings for psconvert in figure.py
willschlitzer Feb 13, 2021
e612529
Update doc strings in blockmedian.py
willschlitzer Feb 13, 2021
8fc0223
Update doc strings in surface.py
willschlitzer Feb 13, 2021
3ae6d0d
Update doc strings in grdcut.py
willschlitzer Feb 13, 2021
a7764ee
Update doc strings in grdfilter.py
willschlitzer Feb 13, 2021
55965dd
Update doc strings in x2sys.py
willschlitzer Feb 13, 2021
1289884
Update doc strings for x2sys_cross in x2sys.py
willschlitzer Feb 13, 2021
6f9379e
Update doc strings for info.py
willschlitzer Feb 13, 2021
6a2c992
Make changed doc strings raw strings
willschlitzer Feb 13, 2021
6f4f25d
Update fmt docstring
willschlitzer Feb 14, 2021
5f1fd46
Formatting fixes
willschlitzer Feb 14, 2021
0c08776
Update output docstring in info.py
willschlitzer Feb 14, 2021
8bcd2ab
Update formatting in makecpt.py
willschlitzer Feb 14, 2021
de9de6d
Apply suggestions from code review
willschlitzer Feb 14, 2021
a84649e
Formatting fixes
willschlitzer Feb 14, 2021
4e6c6d2
Formatting fix
willschlitzer Feb 14, 2021
3cd7330
Merge branch 'master' into docstring-format-non-plotting
willschlitzer Feb 14, 2021
c57bc9d
Apply suggestions from code review
willschlitzer Feb 14, 2021
62e694d
Format fix
willschlitzer Feb 14, 2021
3edc108
Apply suggestions from code review
willschlitzer Feb 14, 2021
3619286
Format fix
willschlitzer Feb 14, 2021
59808ee
Format fix
willschlitzer Feb 14, 2021
029fd32
Merge branch 'master' into docstring-format-non-plotting
willschlitzer Feb 14, 2021
a836e28
Merge branch 'master' into docstring-format-non-plotting
willschlitzer Feb 14, 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
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Meghan Jones <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
  • Loading branch information
3 people committed Feb 14, 2021
commit de9de6dfb38735603ddf2fca7feb4c014a92a1ba
8 changes: 4 additions & 4 deletions pygmt/figure.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ def psconvert(self, **kwargs):
anti_aliasing : str
[**g**\|\ **p**\|\ **t**\][**1**\|\ **2**\|\ **4**].
Set the anti-aliasing options for **g**\ raphics or **t**\ ext.
Append the size of the subsample box (1, 2, or 4) [4]. Default is
no anti-aliasing (same as bits = 1).
Append the size of the subsample box (1, 2, or 4) [4]. [Default is
no anti-aliasing (same as bits = 1)].
fmt : str
Sets the output format, where **b** means BMP, **e** means EPS,
**E** means EPS with PageSize command, **f** means PDF, **F** means
Expand Down Expand Up @@ -180,7 +180,7 @@ def savefig(
Save the figure to a file.

This method implements a matplotlib-like interface for
:doc:psconvert </psconvert>.
:meth:`pygmt.Figure.psconvert`.

Supported formats: PNG (``.png``), JPEG (``.jpg``), PDF (``.pdf``),
BMP (``.bmp``), TIFF (``.tif``), EPS (``.eps``), and KML (``.kml``).
Expand All @@ -202,7 +202,7 @@ def savefig(
anti_alias: bool
If True, will use anti aliasing when creating raster images (PNG,
JPG, TIFF). More specifically, it uses options ``t2, g2`` in
:doc:psconvert </psconvert>. Ignored if creating vector graphics.
:meth:`pygmt.Figure.psconvert`. Ignored if creating vector graphics.
show: bool
If True, will open the figure in an external viewer.
dpi : int
Expand Down
2 changes: 1 addition & 1 deletion pygmt/src/blockmedian.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def blockmedian(table, outfile=None, **kwargs):
spacing : str
*xinc*\[\ *unit*\][**+e**\|\ **n**]
[/*yinc*\ [*unit*][**+e**\|\ **n**]].
x_inc [and optionally y_inc] is the grid spacing.
*xinc* [and optionally *yinc*] is the grid spacing.

region : str or list
*xmin/xmax/ymin/ymax*\[\ **+r**\][**+u**\ *unit*].
Expand Down
4 changes: 2 additions & 2 deletions pygmt/src/grdcut.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def grdcut(grid, **kwargs):
r"""
Extract subregion from a grid.

Produce a new *outgrid* file which is a subregion of *grid*. The
Produce a new ``outgrid`` file which is a subregion of ``grid``. The
subregion is specified with *region*; the specified range must not exceed
the range of *grid* (but see *extend*). If in doubt, run
:meth:`pygmt.grdinfo` to check range. Alternatively, define the subregion
Expand All @@ -54,7 +54,7 @@ def grdcut(grid, **kwargs):
{J}
{R}
extend : bool or int or float
Allow grid to be extended if new *region* exceeds existing boundaries.
Allow grid to be extended if new ``region`` exceeds existing boundaries.
Give a value to initialize nodes outside current region.
circ_subregion : str
*lon/lat/radius*\[\ *unit*\][**+n**].
Expand Down
2 changes: 1 addition & 1 deletion pygmt/src/grdfilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def grdfilter(grid, **kwargs):
spacing : str
*xinc*\[\ *unit*\][**+e**\|\ **n**]
[/*yinc*\ [*unit*][**+e**\|\ **n**]].
x_inc [and optionally y_inc] is the grid spacing.
*xinc* [and optionally *yinc*] is the grid spacing.
nans : str or float
**i**\|\ **p**\|\ **r**.
Determine how NaN-values in the input grid affects the filtered output.
Expand Down
2 changes: 1 addition & 1 deletion pygmt/src/surface.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def surface(x=None, y=None, z=None, data=None, **kwargs):
spacing : str
*xinc*\[\ *unit*\][**+e**\|\ **n**]
willschlitzer marked this conversation as resolved.
Show resolved Hide resolved
[/*yinc*\ [*unit*][**+e**\|\ **n**]].
x_inc [and optionally y_inc] is the grid spacing.
*xinc* [and optionally *yinc*] is the grid spacing.

region : str or list
*xmin/xmax/ymin/ymax*\[\ **+r**\][**+u**\ *unit*].
willschlitzer marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions pygmt/x2sys.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def x2sys_init(tag, **kwargs):

spacing : str or list
*dx*\[/*dy*\].
willschlitzer marked this conversation as resolved.
Show resolved Hide resolved
x_inc [and optionally y_inc] is the grid spacing. Append **m** to
*dx* [and optionally *dy*] is the grid spacing. Append **m** to
indicate minutes or **s** to indicate seconds for geographic data.
These spacings refer to the binning used in the track bin-index data
base.
Expand Down Expand Up @@ -151,7 +151,7 @@ def x2sys_init(tag, **kwargs):
**t**\|\ **d**\ *gap*.
Give **t** or **d** and append the corresponding maximum time gap (in
user units; this is typically seconds [Infinity]), or distance (for
units, see *units*) gap [Infinity]) allowed between the two data points
units, see ``units``) gap [Default is infinity]) allowed between the two data points
immediately on either side of a crossover. If these limits are exceeded
then a data gap is assumed and no COE will be determined.

Expand Down