Merge branch 'main' into test-old-gmt-versions

Author: seisman

README.rst

@@ -31,6 +31,9 @@ PyGMT
 .. image:: https://zenodo.org/badge/DOI/10.5281/3781524.svg
     :alt: Digital Object Identifier for the Zenodo archive
     :target: https://doi.org/10.5281/zenodo.3781524
+.. image:: https://tinyurl.com/y22nb8up
+    :alt: PyOpenSci
+    :target: https://github.com/pyOpenSci/software-review/issues/43
 .. image:: https://img.shields.io/github/license/GenericMappingTools/pygmt?style=flat-square
     :alt: GitHub license
     :target: https://github.com/GenericMappingTools/pygmt/blob/main/LICENSE.txt

doc/contributing.md

@@ -579,7 +579,7 @@ returning the `pygmt.Figure` object:
 def test_my_plotting_case():
     "Test that my plotting method works"
     fig = Figure()
-    fig.basemap(region=[0, 360, -90, 90], projection='W7i', frame=True)
+    fig.basemap(region=[0, 360, -90, 90], projection="W15c", frame=True)
     return fig
 ```
 

examples/gallery/embellishments/legend.py

@@ -10,17 +10,17 @@
 
 fig = pygmt.Figure()
 
-fig.basemap(projection="x1i", region=[0, 7, 3, 7], frame=True)
+fig.basemap(projection="x2c", region=[0, 7, 3, 7], frame=True)
 
 fig.plot(
     data="@Table_5_11.txt",
-    style="c0.15i",
+    style="c0.40c",
     color="lightgreen",
     pen="faint",
     label="Apples",
 )
 fig.plot(data="@Table_5_11.txt", pen="1.5p,gray", label="My lines")
-fig.plot(data="@Table_5_11.txt", style="t0.15i", color="orange", label="Oranges")
+fig.plot(data="@Table_5_11.txt", style="t0.40c", color="orange", label="Oranges")
 
 fig.legend(position="JTR+jTR+o0.2c", box=True)
 

examples/gallery/lines/wiggle.py

@@ -23,11 +23,11 @@
     x=x,
     y=y,
     z=z,
-    # Set anomaly scale to "20c"
+    # Set anomaly scale to 20 centimeters
     scale="20c",
     # Fill positive and negative areas red and gray, respectively
     color=["red+p", "gray+n"],
-    # Set the outline width to "1.0p"
+    # Set the outline width to 1.0 point
     pen="1.0p",
     # Draw a blue track with a width of 0.5 points
     track="0.5p,blue",

examples/tutorials/basics/regions.py

@@ -38,7 +38,7 @@
 ###############################################################################
 #
 # The coordinates can be passed to ``region`` as a list, in the form of
-# [*xmin*,\ *xmax*,\ *ymin*,\ *ymax*].
+# [*xmin*, *xmax*, *ymin*, *ymax*].
 
 fig = pygmt.Figure()
 fig.coast(

pygmt/src/grdcontour.py

@@ -62,8 +62,8 @@ def grdcontour(self, grid, **kwargs):
           single annotation level +\ *annot_int*
         - Disable all annotation with  **-**
         - Optional label modifiers can be specified as a single string
-          ``'[annot_int]+e'``  or with a list of arguments
-          ``([annot_int], 'e', 'f10p', 'gred')``.
+          ``"[annot_int]+e"``  or with a list of arguments
+          ``([annot_int], "e", "f10p", "gred")``.
     limit : str or list of 2 ints
         *low*/*high*.
         Do no draw contours below `low` or above `high`, specify as string

pygmt/src/grdfilter.py

@@ -94,7 +94,7 @@ def grdfilter(grid, **kwargs):
         4: grid (x,y) in degrees, *width* in km, Spherical distance
         calculation.
 
-        5: grid (x,y) in Mercator ``projection='m1'`` img units, *width* in km,
+        5: grid (x,y) in Mercator ``projection="m1"`` img units, *width* in km,
         Spherical distance calculation.
 
     {I}

pygmt/src/grdimage.py

@@ -108,9 +108,9 @@ def grdimage(self, grid, **kwargs):
         image formats you may need to explicitly set ``img_in``, which
         specifies that the grid is in fact an image file to be read via
         GDAL. Append **r** to assign the region specified by ``region``
-        to the image. For example, if you have used ``region='d'`` then the
-        image will be assigned a global domain. This mode allows you to
-        project a raw image (an image without referencing coordinates).
+        to the image. For example, if you have used ``region="d"`` then
+        the image will be assigned a global domain. This mode allows you
+        to project a raw image (an image without referencing coordinates).
     dpi : int
         [**i**\|\ *dpi*].
         Sets the resolution of the projected grid that will be created if a

pygmt/src/legend.py

@@ -45,7 +45,7 @@ def legend(self, spec=None, position="JTR+jTR+o0.2c", box="+gwhite+p1p", **kwarg
     Parameters
     ----------
     spec : None or str
-        Either ``None`` [default] for using the automatically generated legend
+        Either ``None`` [Default] for using the automatically generated legend
         specification file, or a *filename* pointing to the legend
         specification file.
     {J}
@@ -55,7 +55,7 @@ def legend(self, spec=None, position="JTR+jTR+o0.2c", box="+gwhite+p1p", **kwarg
         **+w**\ *width*\ [/*height*]\ [**+j**\ *justify*]\ [**+l**\ *spacing*]\
         [**+o**\ *dx*\ [/*dy*]].
         Defines the reference point on the map for the
-        legend. By default, uses **JTR**\ +\ **jTR**\ +\ **o**\ *0.2c* which
+        legend. By default, uses **JTR**\ **+jTR**\ **+o**\ 0.2c which
         places the legend at the top-right corner inside the map frame, with a
         0.2 cm offset.
     box : bool or str

pygmt/src/plot.py

@@ -90,7 +90,7 @@ def plot(self, data=None, x=None, y=None, size=None, direction=None, **kwargs):
         The size of the data points in units specified using ``style``.
         Only valid if using ``x``/``y``.
     direction : list of two 1d arrays
-        If plotting vectors (using ``style='V'`` or ``style='v'``), then
+        If plotting vectors (using ``style="V"`` or ``style="v"``), then
         should be a list of two 1d arrays with the vector directions. These
         can be angle and length, azimuth and length, or x and y components,
         depending on the style options chosen.
@@ -146,7 +146,7 @@ def plot(self, data=None, x=None, y=None, size=None, direction=None, **kwargs):
           incoming segment [Default].
         - **r** : Same as **s**, but the group reference point is reset
           after each record to the previous point (this method is only
-          available with the ``connection='r'`` scheme).
+          available with the ``connection="r"`` scheme).
 
         Instead of the codes **a**\|\ **f**\|\ **s**\|\ **r** you may append
         the coordinates of a *refpoint* which will serve as a fixed external
@@ -192,7 +192,7 @@ def plot(self, data=None, x=None, y=None, size=None, direction=None, **kwargs):
         color lookup table via ``cmap``.  Alternatively, give the name of a
         *file* with one z-value (read from the last column) for each
         polygon in the input data. To apply it to the fill color, use
-        ``color='+z'``. To apply it to the pen color, append **+z** to
+        ``color="+z"``. To apply it to the pen color, append **+z** to
         ``pen``.
     {a}
     {b}

pygmt/src/plot3d.py

@@ -91,7 +91,7 @@ def plot3d(
         The size of the data points in units specified in ``style``.
         Only valid if using ``x``/``y``/``z``.
     direction : list of two 1d arrays
-        If plotting vectors (using ``style='V'`` or ``style='v'``), then
+        If plotting vectors (using ``style="V"`` or ``style="v"``), then
         should be a list of two 1d arrays with the vector directions. These
         can be angle and length, azimuth and length, or x and y components,
         depending on the style options chosen.
@@ -162,7 +162,7 @@ def plot3d(
         color lookup table via ``cmap``.  Alternatively, give the name of a
         *file* with one z-value (read from the last column) for each
         polygon in the input data. To apply it to the fill color, use
-        ``color='+z'``. To apply it to the pen color, append **+z** to
+        ``color="+z"``. To apply it to the pen color, append **+z** to
         ``pen``.
     {a}
     {b}

pygmt/src/select.py

@@ -56,7 +56,7 @@ def select(data=None, outfile=None, **kwargs):
     7. inside bins of a grid mask whose nodes are non-zero
 
     The sense of the tests can be reversed for each of these 7 criteria by
-    using the ``reverse`` option.
+    using the ``reverse`` parameter.
 
     Full option list at :gmt-docs:`gmtselect.html`
 

pygmt/src/solar.py

@@ -56,7 +56,7 @@ def solar(self, terminator="d", terminator_datetime=None, **kwargs):
         Color or pattern for filling of terminators.
     pen : str
         Set pen attributes for lines. The default pen
-        is ``default,black,solid``.
+        is ``"0.25p,black,solid"``.
     {U}
     {V}
     {XY}

pygmt/src/velo.py

@@ -79,9 +79,9 @@ def velo(self, data=None, **kwargs):
           confidence ellipse. Use **+f** to set the font and size of the text
           [Default is 9p,Helvetica,black]; give **+f**\ 0 to deactivate
           labeling. The arrow will be drawn with the pen attributes specified
-          by the ``pen`` option and the arrow-head can be colored via
+          by the ``pen`` parameter and the arrow-head can be colored via
           ``color``. The ellipse will be filled with the color or shade
-          specified by the ``uncertaintycolor`` option [Default is
+          specified by the ``uncertaintycolor`` parameter [Default is
           transparent], and its outline will be drawn if ``line`` is selected
           using the pen selected (by ``pen`` if not given by ``line``).
           Parameters are expected to be in the following columns:
@@ -112,9 +112,9 @@ def velo(self, data=None, **kwargs):
           confidence ellipse. Use **+f** to set the font and size of the text
           [Default is 9p,Helvetica,black]; give **+f**\ 0 to deactivate
           labeling. The arrow will be drawn with the pen attributes specified
-          by the ``pen`` option and the arrow-head can be colored via
+          by the ``pen`` parameter and the arrow-head can be colored via
           ``color``. The ellipse will be filled with the color or shade
-          specified by the ``uncertaintycolor`` option [Default is
+          specified by the ``uncertaintycolor`` parameter [Default is
           transparent], and its outline will be drawn if ``line`` is selected
           using the pen selected (by ``pen`` if not given by ``line``).
           Parameters are expected to be in the following columns:

pygmt/src/which.py

@@ -25,7 +25,7 @@ def which(fname, **kwargs):
 
     ``fname`` can also be a downloadable file (either a full URL, a
     `@file` special file for downloading from the GMT Site Cache, or
-    `@earth_relief_*` topography grids). In these cases, use option
+    `@earth_relief_*` topography grids). In these cases, use parameter
     ``download`` to set the desired behavior. If ``download`` is not used
     (or False), the file will not be found.
 
@@ -53,7 +53,7 @@ def which(fname, **kwargs):
     Returns
     -------
     path : str or list
-        The path(s) to the file(s), depending on the options used.
+        The path(s) to the file(s), depending on the parameters used.
 
     Raises
     ------

pygmt/src/wiggle.py

@@ -77,7 +77,7 @@ def wiggle(self, data=None, x=None, y=None, z=None, **kwargs):
 
     track : str
         Draw track [Default is no track]. Append pen attributes to use
-        [Default is **0.25p,black,solid**].
+        [Default is ``"0.25p,black,solid"``].
     {U}
     {V}
     pen : str

setup.cfg

@@ -0,0 +1,2 @@
+# An emtpy setup.cfg file for backward compatibility with pip<21.3.
+# See https://github.com/GenericMappingTools/pygmt/issues/2100 for the issue report.