Fix RUF043 violations in ruff v0.13.0 (#4083)

Author: seisman

pygmt/src/_common.py

@@ -242,5 +242,5 @@ def from_params(
         """
         for convention, param_list in cls._params.items():
             if set(param_list).issubset(set(params)):
-                return cls(convention, component=component)
+                return cls(convention, component=component)  # type: ignore[arg-type]
         raise GMTValueError(params, description="focal mechanism parameters")

pygmt/tests/test_alias_system.py

@@ -71,14 +71,14 @@ def test_alias_system_one_alias_short_form():
     # Long-form exists but is not given, and short-form is given.
     with pytest.warns(
         SyntaxWarning,
-        match="Short-form parameter 'J' is not recommended. Use long-form parameter 'projection' instead.",
+        match=r"Short-form parameter 'J' is not recommended. Use long-form parameter 'projection' instead.",
     ):
         assert func(J="X10c") == ["-JX10c"]
 
     # Coexistence of long-form and short-form parameters.
     with pytest.raises(
         GMTInvalidInput,
-        match="Short-form parameter 'J' conflicts with long-form parameters and is not recommended. Use long-form parameter 'projection' instead.",
+        match=r"Short-form parameter 'J' conflicts with long-form parameters and is not recommended. Use long-form parameter 'projection' instead.",
     ):
         func(projection="X10c", J="H10c")
 

pygmt/tests/test_clib_loading.py

@@ -43,7 +43,7 @@ def test_check_libgmt():
     Make sure check_libgmt fails when given a bogus library.
     """
     libgmt = FakedLibGMT("/path/to/libgmt.so")
-    msg = f"Error loading '{libgmt}'. Couldn't access function GMT_Create_Session."
+    msg = rf"Error loading '{libgmt}'. Couldn't access function GMT_Create_Session."
     with pytest.raises(GMTCLibError, match=msg):
         check_libgmt(libgmt)
 
@@ -150,7 +150,7 @@ def test_two_broken_libraries(self):
             rf"Error loading GMT shared library at '{self.faked_libgmt1._name}'.\n"
             rf"Error loading '{self.faked_libgmt1._name}'. Couldn't access.*\n"
             rf"Error loading GMT shared library at '{self.faked_libgmt2._name}'.\n"
-            f"Error loading '{self.faked_libgmt2._name}'. Couldn't access.*"
+            rf"Error loading '{self.faked_libgmt2._name}'. Couldn't access.*"
         )
         with pytest.raises(GMTCLibNotFoundError, match=msg_regex):
             load_libgmt(lib_fullnames=lib_fullnames)
@@ -168,7 +168,7 @@ def test_load_brokenlib_invalidpath(self):
             rf"Error loading GMT shared library at '{self.faked_libgmt1._name}'.\n"
             rf"Error loading '{self.faked_libgmt1._name}'. Couldn't access.*\n"
             rf"Error loading GMT shared library at '{self.invalid_path}'.\n"
-            f"Unable to find '{self.invalid_path}'"
+            rf"Unable to find '{self.invalid_path}'"
         )
         with pytest.raises(GMTCLibNotFoundError, match=msg_regex):
             load_libgmt(lib_fullnames=lib_fullnames)

pygmt/tests/test_clib_put_vector.py

@@ -225,7 +225,7 @@ def test_put_vector_invalid_dtype():
                 dim=[2, 3, 0, 0],  # ncolumns, nrows, dtype, unused
             )
             data = np.array([37, 12, 556], dtype=dtype)
-            with pytest.raises(GMTTypeError, match="Unrecognized data type"):
+            with pytest.raises(GMTTypeError, match=r"Unrecognized data type"):
                 lib.put_vector(dataset, column=0, vector=data)
 
 

pygmt/tests/test_figure.py

@@ -174,7 +174,7 @@ def test_figure_savefig_directory_nonexists():
     """
     fig = Figure()
     fig.basemap(region="10/70/-300/800", projection="X3i/5i", frame="af")
-    with pytest.raises(FileNotFoundError, match="No such directory:"):
+    with pytest.raises(FileNotFoundError, match=r"No such directory:"):
         fig.savefig("a-nonexist-directory/test_figure_savefig_directory_nonexists.png")
 
 
@@ -185,7 +185,7 @@ def test_figure_savefig_unknown_extension():
     fig = Figure()
     fig.basemap(region="10/70/-300/800", projection="X3i/5i", frame="af")
     fname = "test_figure_savefig_unknown_extension.test"
-    with pytest.raises(GMTValueError, match="Invalid file extension: 'test'."):
+    with pytest.raises(GMTValueError, match=r"Invalid file extension: 'test'."):
         fig.savefig(fname)
 
 
@@ -196,7 +196,7 @@ def test_figure_savefig_ps_extension():
     fig = Figure()
     fig.basemap(region="10/70/-300/800", projection="X3c/5c", frame="af")
     fname = "test_figure_savefig_ps_extension.ps"
-    with pytest.raises(GMTValueError, match="Extension '.ps' is not supported."):
+    with pytest.raises(GMTValueError, match=r"Extension '.ps' is not supported."):
         fig.savefig(fname)
 
 

pygmt/tests/test_tilemap.py

@@ -86,7 +86,7 @@ def test_tilemap_no_contextily():
     Raise an ImportError when contextily is not installed.
     """
     fig = Figure()
-    with pytest.raises(ImportError, match="Package `contextily` is required"):
+    with pytest.raises(ImportError, match=r"Package `contextily` is required"):
         fig.tilemap(
             region=[-20000000.0, 20000000.0, -20000000.0, 20000000.0],
             zoom=0,
@@ -105,7 +105,7 @@ def test_tilemap_no_rioxarray():
     # error about contextily, not rioxarray. Here we mock contextily as installed, to
     # make sure that we see the rioxarray error message when rioxarray is not installed.
     with patch("pygmt.datasets.tile_map._HAS_CONTEXTILY", True):
-        with pytest.raises(ImportError, match="Package `rioxarray` is required"):
+        with pytest.raises(ImportError, match=r"Package `rioxarray` is required"):
             fig.tilemap(
                 region=[-180.0, 180.0, -90, 90], zoom=0, lonlat=True, frame="afg"
             )

pygmt/tests/test_xarray_backend.py

@@ -3,7 +3,6 @@
 """
 
 import importlib
-import re
 
 import numpy as np
 import numpy.testing as npt
@@ -121,10 +120,7 @@ def test_xarray_backend_gmt_read_invalid_kind():
     Check that xarray.open_dataarray(..., engine="gmt") fails with missing or incorrect
     'raster_kind'.
     """
-    with pytest.raises(
-        TypeError,
-        match=re.escape("missing a required argument: 'raster_kind'"),
-    ):
+    with pytest.raises(TypeError, match=r"missing a required argument: 'raster_kind'"):
         xr.open_dataarray("nokind.nc", engine="gmt")
 
     with pytest.raises(GMTValueError):