Fix test values and truncate docstrings to 79 char

Make tests pass again, by fixing the test bathymetry values, and cutting our docstrings to 79 characters instead of 88.

Author: weiji14

pygmt/datasets/tutorial.py

@@ -40,7 +40,8 @@ def load_japan_quakes():
 
 def load_ocean_ridge_points():
     """
-    Load a table of ocean ridge points for the entire world as a pandas.DataFrame.
+    Load a table of ocean ridge points for the entire world as a
+    pandas.DataFrame.
 
     This is the ``@ridge.txt`` dataset used in the GMT tutorials.
 

pygmt/sampling.py

@@ -20,35 +20,39 @@ def grdtrack(points, grid, newcolname=None, outfile=None, **kwargs):
     Sample grids at specified (x,y) locations.
 
     Grdtrack reads one or more grid files and a table with (x,y) [or (lon,lat)]
-    positions in the first two columns (more columns may be present). It interpolates
-    the grid(s) at the positions in the table and writes out the table with the
-    interpolated values added as (one or more) new columns. A bicubic [Default],
-    bilinear, B-spline or nearest-neighbor (see -n) interpolation is used, requiring
-    boundary conditions at the limits of the region.
+    positions in the first two columns (more columns may be present). It
+    interpolates the grid(s) at the positions in the table and writes out the
+    table with the interpolated values added as (one or more) new columns. A
+    bicubic [Default], bilinear, B-spline or nearest-neighbor (see -n)
+    interpolation is used, requiring boundary conditions at the limits of the
+    region.
 
     Full option list at :gmt-docs:`grdtrack.html`
 
     Parameters
     ----------
     points: pandas.DataFrame or file (csv, txt, etc)
-        Either a table with (x, y) or (lon, lat) values in the first two columns,
-        or a data file name. More columns may be present.
+        Either a table with (x, y) or (lon, lat) values in the first two
+        columns, or a data file name. More columns may be present.
 
     grid: xarray.DataArray or file (netcdf)
         Gridded array from which to sample values from.
 
     newcolname: str
-        Required if 'points' is a pandas.DataFrame. The name for the new column in the
-        track pandas.DataFrame table where the sampled values will be placed.
+        Required if 'points' is a pandas.DataFrame. The name for the new column
+        in the track pandas.DataFrame table where the sampled values will be
+        placed.
 
     outfile: str
-        Required if 'points' is a file. The file name for the output ASCII file.
+        Required if 'points' is a file. The file name for the output ASCII
+        file.
 
     Returns
     -------
     track: pandas.DataFrame or None
         Return type depends on whether the outfile parameter is set:
-        - pandas.DataFrame table with (x, y, ..., newcolname) if outfile is not set
+        - pandas.DataFrame table with (x, y, ..., newcolname) if outfile is not
+          set
         - None if outfile is set (track output will be stored in outfile)
 
     """
@@ -75,7 +79,8 @@ def grdtrack(points, grid, newcolname=None, outfile=None, **kwargs):
             else:
                 raise GMTInvalidInput(f"Unrecognized data type {type(grid)}")
 
-            # Run grdtrack on the temp (csv) points table and (netcdf) grid virtualfiles
+            # Run grdtrack on the temporary (csv) points table
+            # and (netcdf) grid virtualfile
             with table_context as csvfile:
                 with grid_context as grdfile:
                     kwargs.update({"G": grdfile})

pygmt/tests/test_grdtrack.py

@@ -19,15 +19,16 @@
 
 def test_grdtrack_input_dataframe_and_dataarray():
     """
-    Run grdtrack by passing in a pandas.DataFrame and xarray.DataArray as inputs
+    Run grdtrack by passing in a pandas.DataFrame and xarray.DataArray as
+    inputs
     """
     dataframe = load_ocean_ridge_points()
     dataarray = load_earth_relief().sel(lat=slice(-49, -42), lon=slice(-118, -107))
 
     output = grdtrack(points=dataframe, grid=dataarray, newcolname="bathymetry")
     assert isinstance(output, pd.DataFrame)
     assert output.columns.to_list() == ["longitude", "latitude", "bathymetry"]
-    npt.assert_allclose(output.iloc[0], [-110.9536, -42.2489, -2799.085897])
+    npt.assert_allclose(output.iloc[0], [-110.9536, -42.2489, -2797.482959])
 
     return output
 
@@ -45,7 +46,7 @@ def test_grdtrack_input_csvfile_and_dataarray():
         assert os.path.exists(path=TEMP_TRACK)  # check that outfile exists at path
 
         track = pd.read_csv(TEMP_TRACK, sep="\t", header=None, comment=">")
-        npt.assert_allclose(track.iloc[0], [-110.9536, -42.2489, -2799.085897])
+        npt.assert_allclose(track.iloc[0], [-110.9536, -42.2489, -2797.482959])
     finally:
         os.remove(path=TEMP_TRACK)
 
@@ -62,7 +63,7 @@ def test_grdtrack_input_dataframe_and_ncfile():
     output = grdtrack(points=dataframe, grid=ncfile, newcolname="bathymetry")
     assert isinstance(output, pd.DataFrame)
     assert output.columns.to_list() == ["longitude", "latitude", "bathymetry"]
-    npt.assert_allclose(output.iloc[0], [-32.2971, 37.4118, -1685.745884])
+    npt.assert_allclose(output.iloc[0], [-32.2971, 37.4118, -1686.692142])
 
     return output
 
@@ -80,7 +81,7 @@ def test_grdtrack_input_csvfile_and_ncfile():
         assert os.path.exists(path=TEMP_TRACK)  # check that outfile exists at path
 
         track = pd.read_csv(TEMP_TRACK, sep="\t", header=None, comment=">")
-        npt.assert_allclose(track.iloc[0], [-32.2971, 37.4118, -1685.745884])
+        npt.assert_allclose(track.iloc[0], [-32.2971, 37.4118, -1686.692142])
     finally:
         os.remove(path=TEMP_TRACK)
 
@@ -89,7 +90,8 @@ def test_grdtrack_input_csvfile_and_ncfile():
 
 def test_grdtrack_wrong_kind_of_points_input():
     """
-    Run grdtrack using points input that is not a pandas.DataFrame (matrix) or file
+    Run grdtrack using points input that is not a pandas.DataFrame (matrix) or
+    file
     """
     dataframe = load_ocean_ridge_points()
     invalid_points = dataframe.longitude.to_xarray()
@@ -102,7 +104,8 @@ def test_grdtrack_wrong_kind_of_points_input():
 
 def test_grdtrack_wrong_kind_of_grid_input():
     """
-    Run grdtrack using grid input that is not as xarray.DataArray (grid) or file
+    Run grdtrack using grid input that is not as xarray.DataArray (grid) or
+    file
     """
     dataframe = load_ocean_ridge_points()
     dataarray = load_earth_relief().sel(lat=slice(-49, -42), lon=slice(-118, -107))