Remove east_pacific_rise_grid, add test for load_ocean_ridge_points

One less dataset to test by replacing the east_pacific_rise_grid with the earth_relief 60m grid (sliced to the same area). Also add tests for loading the ocean_ridge_points dataset.

Author: weiji14

pygmt/datasets/__init__.py

@@ -3,7 +3,6 @@
 # Load sample data included with GMT (downloaded from the GMT cache server).
 
 from .tutorial import (
-    load_east_pacific_rise_grid,
     load_japan_quakes,
     load_ocean_ridge_points,
     load_sample_bathymetry,

pygmt/datasets/tutorial.py

@@ -7,28 +7,6 @@
 from .. import which
 
 
-def load_east_pacific_rise_grid():
-    """
-    Load a grid of bathymetry over part of the East Pacific Rise as a xarray.DataArray.
-
-    This is the ``@spac_33.nc`` dataset used in the GMT tutorials.
-
-    The data are downloaded to a cache directory (usually ``~/.gmt/cache``) the
-    first time you invoke this function. Afterwards, it will load the data from
-    the cache. So you'll need an internet connection the first time around.
-
-    Returns
-    -------
-    data : xarray.DataArray
-        The data grid. Coordinates in longitude (lon) and latitude (lat).
-        Data attributes: bathymetry (z) in metres.
-    """
-    fname = which("@spac_33.nc", download="c")
-    with xr.open_dataarray(fname) as dataarray:
-        data = dataarray.load()
-    return data
-
-
 def load_japan_quakes():
     """
     Load a table of earthquakes around Japan as a pandas.Dataframe.

pygmt/tests/test_datasets.py

@@ -8,6 +8,7 @@
 from ..datasets import (
     load_japan_quakes,
     load_earth_relief,
+    load_ocean_ridge_points,
     load_sample_bathymetry,
     load_usgs_quakes,
 )
@@ -27,6 +28,17 @@ def test_japan_quakes():
     assert summary.loc["max", "day"] == 31
 
 
+def test_ocean_ridge_points():
+    "Check that the @ridge.txt dataset loads without errors"
+    data = load_ocean_ridge_points()
+    assert data.shape == (4146, 2)
+    summary = data.describe()
+    assert summary.loc["min", "longitude"] == -179.9401
+    assert summary.loc["max", "longitude"] == 179.935
+    assert summary.loc["min", "latitude"] == -65.6182
+    assert summary.loc["max", "latitude"] == 86.8
+
+
 def test_sample_bathymetry():
     "Check that the @tut_ship.xyz dataset loads without errors"
     data = load_sample_bathymetry()

pygmt/tests/test_grdtrack.py

@@ -7,7 +7,7 @@
 
 from .. import grdtrack
 from .. import which
-from ..datasets import load_east_pacific_rise_grid, load_ocean_ridge_points
+from ..datasets import load_earth_relief, load_ocean_ridge_points
 from ..exceptions import GMTInvalidInput
 from ..helpers import data_kind
 
@@ -17,12 +17,12 @@ def test_grdtrack_input_dataframe_and_dataarray():
     Run grdtrack by passing in a pandas.DataFrame and xarray.DataArray as inputs
     """
     dataframe = load_ocean_ridge_points()
-    dataarray = load_east_pacific_rise_grid()
+    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"]
-    assert output.iloc[0].to_list() == [-110.9536, -42.2489, -2950.49576833]
+    assert output.iloc[0].to_list() == [-110.9536, -42.2489, -2823.96637605]
 
     return output
 
@@ -32,12 +32,12 @@ def test_grdtrack_input_dataframe_and_ncfile():
     Run grdtrack by passing in a pandas.DataFrame and netcdf file as inputs
     """
     dataframe = load_ocean_ridge_points()
-    ncfile = which("@spac_33.nc", download="c")
+    ncfile = which("@earth_relief_60m", download="c")
 
     output = grdtrack(points=dataframe, grid=ncfile, newcolname="bathymetry")
     assert isinstance(output, pd.DataFrame)
     assert output.columns.to_list() == ["longitude", "latitude", "bathymetry"]
-    assert output.iloc[0].to_list() == [-110.9536, -42.2489, -2950.49576833]
+    assert output.iloc[0].to_list() == [-32.2971, 37.4118, -1697.87197487]
 
     return output
 
@@ -48,7 +48,7 @@ def test_grdtrack_wrong_kind_of_points_input():
     """
     dataframe = load_ocean_ridge_points()
     invalid_points = dataframe.longitude.to_xarray()
-    dataarray = load_east_pacific_rise_grid()
+    dataarray = load_earth_relief().sel(lat=slice(-49, -42), lon=slice(-118, -107))
 
     assert data_kind(invalid_points) == "grid"
     with pytest.raises(GMTInvalidInput):
@@ -60,7 +60,7 @@ def test_grdtrack_wrong_kind_of_grid_input():
     Run grdtrack using grid input that is not as xarray.DataArray (grid) or file
     """
     dataframe = load_ocean_ridge_points()
-    dataarray = load_east_pacific_rise_grid()
+    dataarray = load_earth_relief().sel(lat=slice(-49, -42), lon=slice(-118, -107))
     invalid_grid = dataarray.to_dataset()
 
     assert data_kind(invalid_grid) == "matrix"
@@ -73,7 +73,7 @@ def test_grdtrack_without_newcolname_setting():
     Run grdtrack by not passing in newcolname parameter setting
     """
     dataframe = load_ocean_ridge_points()
-    dataarray = load_east_pacific_rise_grid()
+    dataarray = load_earth_relief().sel(lat=slice(-49, -42), lon=slice(-118, -107))
 
     with pytest.raises(GMTInvalidInput):
         grdtrack(points=dataframe, grid=dataarray)