Merge branch 'main' into to_numpy/pandas_numeric

Author: seisman

environment.yml

@@ -27,7 +27,7 @@ dependencies:
     # Dev dependencies (style checks)
     - codespell
     - pre-commit
-    - ruff>=0.3.0
+    - ruff>=0.8.0
     # Dev dependencies (unit testing)
     - matplotlib-base
     - pytest>=6.0

pygmt/accessors.py

@@ -138,10 +138,11 @@ def registration(self):
     @registration.setter
     def registration(self, value):
         if value not in {0, 1}:
-            raise GMTInvalidInput(
+            msg = (
                 f"Invalid grid registration value: {value}, should be either "
                 "0 for Gridline registration or 1 for Pixel registration."
             )
+            raise GMTInvalidInput(msg)
         self._registration = value
 
     @property
@@ -154,8 +155,9 @@ def gtype(self):
     @gtype.setter
     def gtype(self, value):
         if value not in {0, 1}:
-            raise GMTInvalidInput(
+            msg = (
                 f"Invalid coordinate system type: {value}, should be "
                 "either 0 for Cartesian or 1 for Geographic."
             )
+            raise GMTInvalidInput(msg)
         self._gtype = value

pygmt/clib/loading.py

@@ -118,7 +118,8 @@ def clib_names(os_name: str) -> list[str]:
         case "win32":  # Windows
             libnames = ["gmt.dll", "gmt_w64.dll", "gmt_w32.dll"]
         case _:
-            raise GMTOSError(f"Operating system '{os_name}' is not supported.")
+            msg = f"Operating system '{os_name}' is not supported."
+            raise GMTOSError(msg)
     return libnames
 
 

pygmt/clib/session.py

@@ -173,7 +173,8 @@ def session_pointer(self) -> ctp.c_void_p:
             the context manager).
         """
         if getattr(self, "_session_pointer", None) is None:
-            raise GMTCLibNoSessionError("No currently open GMT API session.")
+            msg = "No currently open GMT API session."
+            raise GMTCLibNoSessionError(msg)
         return self._session_pointer
 
     @session_pointer.setter
@@ -276,7 +277,8 @@ def get_enum(self, name: str) -> int:
         session = None
         value = c_get_enum(session, name.encode())
         if value is None or value == -99999:
-            raise GMTCLibError(f"Constant '{name}' doesn't exist in libgmt.")
+            msg = f"Constant '{name}' doesn't exist in libgmt."
+            raise GMTCLibError(msg)
         return value
 
     def get_libgmt_func(
@@ -558,7 +560,8 @@ def get_common(self, option: str) -> bool | int | float | np.ndarray:
         pygmt.exceptions.GMTInvalidInput: Unknown GMT common option flag 'A'.
         """
         if option not in "BIJRUVXYabfghinoprst:":
-            raise GMTInvalidInput(f"Unknown GMT common option flag '{option}'.")
+            msg = f"Unknown GMT common option flag '{option}'."
+            raise GMTInvalidInput(msg)
 
         c_get_common = self.get_libgmt_func(
             "GMT_Get_Common",
@@ -1194,7 +1197,8 @@ def read_data(
             data,
         )
         if data_ptr is None:
-            raise GMTCLibError(f"Failed to read dataset from '{infile}'.")
+            msg = f"Failed to read dataset from '{infile}'."
+            raise GMTCLibError(msg)
         return ctp.cast(data_ptr, ctp.POINTER(dtype))
 
     def write_data(self, family, geometry, mode, wesn, output, data):
@@ -1264,7 +1268,8 @@ def write_data(self, family, geometry, mode, wesn, output, data):
             data,
         )
         if status != 0:
-            raise GMTCLibError(f"Failed to write dataset to '{output}'")
+            msg = f"Failed to write dataset to '{output}'."
+            raise GMTCLibError(msg)
 
     @contextlib.contextmanager
     def open_virtualfile(
@@ -1856,9 +1861,8 @@ def virtualfile_in(
             elif check_kind == "vector":
                 valid_kinds += ("empty", "matrix", "vectors", "geojson")
             if kind not in valid_kinds:
-                raise GMTInvalidInput(
-                    f"Unrecognized data type for {check_kind}: {type(data)}"
-                )
+                msg = f"Unrecognized data type for {check_kind}: {type(data)}."
+                raise GMTInvalidInput(msg)
 
         # Decide which virtualfile_from_ function to use
         _virtualfile_from = {
@@ -2110,7 +2114,8 @@ def read_virtualfile(
         if kind is None:  # Return the ctypes void pointer
             return pointer
         if kind == "cube":
-            raise NotImplementedError(f"kind={kind} is not supported yet.")
+            msg = f"kind={kind} is not supported yet."
+            raise NotImplementedError(msg)
         dtype = {"dataset": _GMT_DATASET, "grid": _GMT_GRID, "image": _GMT_IMAGE}[kind]
         return ctp.cast(pointer, ctp.POINTER(dtype))
 
@@ -2378,5 +2383,6 @@ def extract_region(self) -> np.ndarray:
             region.ctypes.data_as(ctp.POINTER(ctp.c_double)),
         )
         if status != 0:
-            raise GMTCLibError("Failed to extract region from current figure.")
+            msg = "Failed to extract region from current figure."
+            raise GMTCLibError(msg)
         return region

pygmt/datasets/earth_magnetic_anomaly.py

@@ -139,10 +139,11 @@ def load_earth_magnetic_anomaly(
         "wdmam": "earth_wdmam",
     }.get(data_source)
     if prefix is None:
-        raise GMTInvalidInput(
+        msg = (
             f"Invalid earth magnetic anomaly data source '{data_source}'. "
             "Valid values are 'emag2', 'emag2_4km', and 'wdmam'."
         )
+        raise GMTInvalidInput(msg)
     grid = _load_remote_dataset(
         name="earth_wdmam" if data_source == "wdmam" else "earth_mag",
         prefix=prefix,

pygmt/datasets/earth_relief.py

@@ -155,17 +155,19 @@ def load_earth_relief(
         "synbath": "earth_synbath",
     }.get(data_source)
     if prefix is None:
-        raise GMTInvalidInput(
+        msg = (
             f"Invalid earth relief data source '{data_source}'. "
             "Valid values are 'igpp', 'gebco', 'gebcosi', and 'synbath'."
         )
+        raise GMTInvalidInput(msg)
     # Use SRTM or not.
     if use_srtm and resolution in land_only_srtm_resolutions:
         if data_source != "igpp":
-            raise GMTInvalidInput(
-                f"Option 'use_srtm=True' doesn't work with data source '{data_source}'."
-                " Please set 'data_source' to 'igpp'."
+            msg = (
+                f"Option 'use_srtm=True' doesn't work with data source '{data_source}'. "
+                "Please set 'data_source' to 'igpp'."
             )
+            raise GMTInvalidInput(msg)
         prefix = "srtm_relief"
     # Choose earth relief dataset
     match data_source:

pygmt/datasets/samples.py

@@ -347,5 +347,6 @@ def load_sample_data(
     >>> data = load_sample_data("bathymetry")
     """  # noqa: W505
     if name not in datasets:
-        raise GMTInvalidInput(f"Invalid dataset name '{name}'.")
+        msg = f"Invalid dataset name '{name}'."
+        raise GMTInvalidInput(msg)
     return datasets[name].func()

pygmt/helpers/decorators.py

@@ -569,10 +569,11 @@ def new_module(*args, **kwargs):
             """
             for short_param, long_alias in aliases.items():
                 if long_alias in kwargs and short_param in kwargs:
-                    raise GMTInvalidInput(
+                    msg = (
                         f"Parameters in short-form ({short_param}) and "
                         f"long-form ({long_alias}) can't coexist."
                     )
+                    raise GMTInvalidInput(msg)
                 if long_alias in kwargs:
                     kwargs[short_param] = kwargs.pop(long_alias)
                 elif short_param in kwargs:
@@ -721,9 +722,8 @@ def kwargs_to_strings(**conversions):
 
     for arg, fmt in conversions.items():
         if fmt not in separators:
-            raise GMTInvalidInput(
-                f"Invalid conversion type '{fmt}' for argument '{arg}'."
-            )
+            msg = f"Invalid conversion type '{fmt}' for argument '{arg}'."
+            raise GMTInvalidInput(msg)
 
     # Make the actual decorator function
     def converter(module_func):
@@ -837,9 +837,8 @@ def new_module(*args, **kwargs):
             """
             if oldname in kwargs:
                 if newname in kwargs:
-                    raise GMTInvalidInput(
-                        f"Can't provide both '{newname}' and '{oldname}'."
-                    )
+                    msg = f"Can't provide both '{newname}' and '{oldname}'."
+                    raise GMTInvalidInput(msg)
                 msg = (
                     f"The '{oldname}' parameter has been deprecated since {deprecate_version}"
                     f" and will be removed in {remove_version}."

pygmt/helpers/tempfile.py

@@ -203,10 +203,11 @@ def tempfile_from_image(image):
         try:
             image.rio.to_raster(raster_path=tmpfile.name)
         except AttributeError as e:  # object has no attribute 'rio'
-            raise ImportError(
+            msg = (
                 "Package `rioxarray` is required to be installed to use this function. "
                 "Please use `python -m pip install rioxarray` or "
                 "`mamba install -c conda-forge rioxarray` "
                 "to install the package."
-            ) from e
+            )
+            raise ImportError(msg) from e
         yield tmpfile.name

pygmt/helpers/testing.py

@@ -112,11 +112,12 @@ def wrapper(*args, ext="png", request=None, **kwargs):
                 else:  # Images are not the same
                     for key in ["actual", "expected", "diff"]:
                         err[key] = Path(err[key]).relative_to(".")
-                    raise GMTImageComparisonFailure(
+                    msg = (
                         f"images not close (RMS {err['rms']:.3f}):\n"
                         f"\t{err['actual']}\n"
                         f"\t{err['expected']}"
                     )
+                    raise GMTImageComparisonFailure(msg)
             finally:
                 del fig_ref
                 del fig_test