Merge branch 'main' into docformatter-1.7.0

Author: weiji14

.github/workflows/cache_data.yaml

@@ -35,7 +35,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/ci_docs.yml

@@ -67,7 +67,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/ci_doctests.yaml

@@ -42,7 +42,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/ci_tests.yaml

@@ -96,7 +96,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/ci_tests_dev.yaml

@@ -91,7 +91,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/ci_tests_legacy.yaml

@@ -54,7 +54,7 @@ jobs:
 
       # Install Micromamba with conda-forge dependencies
       - name: Setup Micromamba
-        uses: mamba-org/[email protected].0
+        uses: mamba-org/[email protected].1
         with:
           environment-name: pygmt
           condarc: |

.github/workflows/publish-to-pypi.yml

@@ -68,10 +68,10 @@ jobs:
         ls -lh dist/
 
     - name: Publish to Test PyPI
-      uses: pypa/[email protected].5
+      uses: pypa/[email protected].6
       with:
         repository-url: https://test.pypi.org/legacy/
 
     - name: Publish to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/[email protected].5
+      uses: pypa/[email protected].6

pygmt/src/grdhisteq.py

@@ -191,8 +191,8 @@ def equalize_grid(
         Example
         -------
         >>> import pygmt
-        >>> # Load a grid of @earth_relief_30m data, with an x-range of 10 to
-        >>> # 30, and a y-range of 15 to 25
+        >>> # Load a grid of @earth_relief_30m data, with a longitude range
+        >>> # of 10°E to 30°E, and a latitude range of 15°N to 25°N
         >>> grid = pygmt.datasets.load_earth_relief(
         ...     resolution="30m", region=[10, 30, 15, 25]
         ... )
@@ -295,12 +295,12 @@ def compute_bins(
         Example
         -------
         >>> import pygmt
-        >>> # Load a grid of @earth_relief_30m data, with an x-range of 10 to
-        >>> # 30, and a y-range of 15 to 25
+        >>> # Load a grid of @earth_relief_30m data, with a longitude range of
+        >>> # 10°E to 30°E, and a latitude range of 15°N to 25°N
         >>> grid = pygmt.datasets.load_earth_relief(
         ...     resolution="30m", region=[10, 30, 15, 25]
         ... )
-        >>> # Find elevation intervals that splits the data range into 5
+        >>> # Find elevation intervals that split the data range into 5
         >>> # divisions, each of which have an equal area in the original grid.
         >>> bins = pygmt.grdhisteq.compute_bins(grid=grid, divisions=5)
         >>> print(bins)

pygmt/src/rose.py

@@ -108,7 +108,7 @@ def rose(self, data=None, length=None, azimuth=None, **kwargs):
 
     frame : str
          Set map boundary frame and axes attributes. Remember that *x*
-         here is radial distance and *y* is azimuth. The ylabel may be
+         here is radial distance and *y* is azimuth. The y label may be
          used to plot a figure caption. The scale bar length is determined
          by the radial gridline spacing.