Fix some tests

Author: seisman

pygmt/clib/session.py

@@ -1869,7 +1869,7 @@ def virtualfile_in(  # noqa: PLR0912
                 valid_kinds += ("empty", "matrix", "vectors", "geojson")
             if kind not in valid_kinds:
                 raise GMTTypeError(
-                    type(data), reason="Unrecognized for {check_kind!r} kind."
+                    type(data), reason=f"Unrecognized for {check_kind!r} kind."
                 )
 
         # Decide which virtualfile_from_ function to use

pygmt/tests/test_blockm.py

@@ -11,7 +11,7 @@
 import xarray as xr
 from pygmt import blockmean, blockmode
 from pygmt.datasets import load_sample_data
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTTypeError
 from pygmt.helpers import GMTTempFile
 
 
@@ -68,7 +68,7 @@ def test_blockmean_wrong_kind_of_input_table_grid(dataframe):
     Run blockmean using table input that is not a pandas.DataFrame or file but a grid.
     """
     invalid_table = dataframe.bathymetry.to_xarray()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         blockmean(data=invalid_table, spacing="5m", region=[245, 255, 20, 30])
 
 

pygmt/tests/test_blockmedian.py

@@ -9,7 +9,7 @@
 import pytest
 from pygmt import blockmedian
 from pygmt.datasets import load_sample_data
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTTypeError
 from pygmt.helpers import GMTTempFile
 
 
@@ -65,7 +65,7 @@ def test_blockmedian_wrong_kind_of_input_table_grid(dataframe):
     Run blockmedian using table input that is not a pandas.DataFrame or file but a grid.
     """
     invalid_table = dataframe.bathymetry.to_xarray()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         blockmedian(data=invalid_table, spacing="5m", region=[245, 255, 20, 30])
 
 

pygmt/tests/test_clib_call_module.py

@@ -6,7 +6,7 @@
 
 import pytest
 from pygmt import Figure, clib
-from pygmt.exceptions import GMTCLibError, GMTInvalidInput
+from pygmt.exceptions import GMTCLibError, GMTTypeError
 from pygmt.helpers import GMTTempFile
 
 POINTS_DATA = Path(__file__).parent / "data" / "points.txt"
@@ -53,7 +53,7 @@ def test_call_module_invalid_argument_type():
     call_module only accepts a string or a list of strings as module arguments.
     """
     with clib.Session() as lib:
-        with pytest.raises(GMTInvalidInput):
+        with pytest.raises(GMTTypeError):
             lib.call_module("get", ("FONT_TITLE", "FONT_TAG"))
 
 

pygmt/tests/test_grd2cpt.py

@@ -6,7 +6,7 @@
 
 import pytest
 from pygmt import Figure, grd2cpt
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTInvalidInput, GMTTypeError
 from pygmt.helpers import GMTTempFile
 from pygmt.helpers.testing import load_static_earth_relief
 
@@ -62,7 +62,7 @@ def test_grd2cpt_unrecognized_data_type():
     """
     Test that an error will be raised if an invalid data type is passed to grid.
     """
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         grd2cpt(grid=0)
 
 

pygmt/tests/test_grdfilter.py

@@ -9,7 +9,7 @@
 import xarray as xr
 from pygmt import grdfilter
 from pygmt.enums import GridRegistration, GridType
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTTypeError
 from pygmt.helpers import GMTTempFile
 from pygmt.helpers.testing import load_static_earth_relief
 
@@ -79,5 +79,5 @@ def test_grdfilter_fails():
     """
     Check that grdfilter fails correctly.
     """
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         grdfilter(np.arange(10).reshape((5, 2)))

pygmt/tests/test_grdimage.py

@@ -10,7 +10,7 @@
 from pygmt.clib import __gmt_version__
 from pygmt.datasets import load_earth_relief
 from pygmt.enums import GridRegistration, GridType
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTInvalidInput, GMTTypeError
 from pygmt.helpers.testing import check_figures_equal
 
 
@@ -156,7 +156,7 @@ def test_grdimage_fails():
     Should fail for unrecognized input.
     """
     fig = Figure()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         fig.grdimage(np.arange(20).reshape((4, 5)))
 
 

pygmt/tests/test_grdinfo.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 from pygmt import grdinfo
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTTypeError
 from pygmt.helpers.testing import load_static_earth_relief
 
 
@@ -30,7 +30,7 @@ def test_grdinfo_fails():
     """
     Check that grdinfo fails correctly.
     """
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         grdinfo(np.arange(10).reshape((5, 2)))
 
 

pygmt/tests/test_grdtrack.py

@@ -9,7 +9,7 @@
 import pandas as pd
 import pytest
 from pygmt import grdtrack
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTInvalidInput, GMTTypeError
 from pygmt.helpers import GMTTempFile
 from pygmt.helpers.testing import load_static_earth_relief
 
@@ -129,7 +129,7 @@ def test_grdtrack_wrong_kind_of_points_input(dataarray, dataframe):
     Run grdtrack using points input that is not a pandas.DataFrame or file.
     """
     invalid_points = dataframe.longitude.to_xarray()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         grdtrack(points=invalid_points, grid=dataarray, newcolname="bathymetry")
 
 
@@ -138,7 +138,7 @@ def test_grdtrack_wrong_kind_of_grid_input(dataarray, dataframe):
     Run grdtrack using grid input that is not an xarray.DataArray or file.
     """
     invalid_grid = dataarray.to_dataset()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         grdtrack(points=dataframe, grid=invalid_grid, newcolname="bathymetry")
 
 

pygmt/tests/test_grdview.py

@@ -4,7 +4,7 @@
 
 import pytest
 from pygmt import Figure, grdcut
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTTypeError
 from pygmt.helpers import GMTTempFile
 from pygmt.helpers.testing import load_static_earth_relief
 
@@ -59,7 +59,7 @@ def test_grdview_wrong_kind_of_grid(xrgrid):
     """
     dataset = xrgrid.to_dataset()  # convert xarray.DataArray to xarray.Dataset
     fig = Figure()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         fig.grdview(grid=dataset)
 
 
@@ -237,5 +237,5 @@ def test_grdview_wrong_kind_of_drapegrid(xrgrid):
     """
     dataset = xrgrid.to_dataset()  # convert xarray.DataArray to xarray.Dataset
     fig = Figure()
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTTypeError):
         fig.grdview(grid=xrgrid, drapegrid=dataset)