Merge branch 'main' into basemap-default-frame

GenericMappingTools · Apr 30, 2022 · 8232f85 · 8232f85
2 parents c050165 + 0c694ad
commit 8232f85
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pygmt/helpers/utils.py b/pygmt/helpers/utils.py
@@ -150,7 +150,7 @@ def build_arg_string(kwdict, infile=None, outfile=None):
     args : str
         The space-delimited argument string with '-' inserted before each
         keyword. The arguments are sorted alphabetically, with optional input
-        file at the begining and optioanl output file at the end.
+        file at the beginning and optional output file at the end.
 
     Examples
     --------

diff --git a/pygmt/src/grdhisteq.py b/pygmt/src/grdhisteq.py
@@ -40,7 +40,7 @@ class grdhisteq:  # pylint: disable=invalid-name
     which have an equal area in the image [Default is 16 if ``divisions`` is
     not set]. The :class:`pandas.DataFrame` or ASCII file output can be used to
     make a colormap with :meth:`pygmt.makecpt` and an image with
-    :meth:`pygmt.Figure.grdimage` that has all levels of gray occuring
+    :meth:`pygmt.Figure.grdimage` that has all levels of gray occurring
     equally.
 
     :meth:`pygmt.grdhisteq.equalize_grid` provides a way to write a grid with
@@ -254,7 +254,7 @@ def compute_bins(
         ``divisions`` is not set]. The :class:`pandas.DataFrame` or ASCII file
         output can be used to make a colormap with :meth:`pygmt.makecpt` and an
         image with :meth:`pygmt.Figure.grdimage` that has all levels of gray
-        occuring equally.
+        occurring equally.
 
         Full option list at :gmt-docs:`grdhisteq.html`
 

diff --git a/pygmt/tests/test_xyz2grd.py b/pygmt/tests/test_xyz2grd.py
@@ -42,7 +42,7 @@ def fixture_grid_result():
 @pytest.mark.parametrize("array_func", [np.array, xr.Dataset])
 def test_xyz2grd_input_array(array_func, ship_data, expected_grid):
     """
-    Run xyz2grd by passing in an xarray datset or numpy array.
+    Run xyz2grd by passing in an xarray dataset or numpy array.
     """
     output = xyz2grd(data=array_func(ship_data), spacing=5, region=[245, 255, 20, 30])
     assert isinstance(output, xr.DataArray)