Merge pull request #574 from DimitriPapadopoulos/RUF

effigies · web-flow · commit 15a906eb5162 · 2024-10-04T16:12:17.000-04:00
Apply ruff rules (RUF)
diff --git a/nipy/algorithms/registration/affine.py b/nipy/algorithms/registration/affine.py
@@ -345,10 +345,10 @@ def compose(self, other):
         return a
 
     def __str__(self):
-        string = f'translation : {str(self.translation)}\n'
-        string += f'rotation    : {str(self.rotation)}\n'
-        string += f'scaling     : {str(self.scaling)}\n'
-        string += f'pre-rotation: {str(self.pre_rotation)}'
+        string = f'translation : {self.translation}\n'
+        string += f'rotation    : {self.rotation}\n'
+        string += f'scaling     : {self.scaling}\n'
+        string += f'pre-rotation: {self.pre_rotation}'
         return string
 
     def inv(self):
@@ -388,8 +388,8 @@ def from_matrix44(self, aff):
         self._vec12 = vec12
 
     def __str__(self):
-        string = f'translation : {str(self.translation)}\n'
-        string += f'rotation    : {str(self.rotation)}\n'
+        string = f'translation : {self.translation}\n'
+        string += f'rotation    : {self.rotation}\n'
         return string
 
 
@@ -430,9 +430,9 @@ def _set_param(self, p):
     param = property(Affine._get_param, _set_param)
 
     def __str__(self):
-        string = f'translation : {str(self.translation)}\n'
-        string += f'rotation    : {str(self.rotation)}\n'
-        string += f'scaling     : {str(self.scaling[0])}\n'
+        string = f'translation : {self.translation}\n'
+        string += f'rotation    : {self.rotation}\n'
+        string += f'scaling     : {self.scaling[0]}\n'
         return string
 
 
diff --git a/nipy/algorithms/statistics/formula/formulae.py b/nipy/algorithms/statistics/formula/formulae.py
@@ -1061,7 +1061,7 @@ def get_term(self, level):
         """
         if level not in self.levels:
             raise ValueError('level not found')
-        return self[f"{self.name}_{str(level)}"]
+        return self[f"{self.name}_{level}"]
 
     def _getmaineffect(self, ref=-1):
         v = list(self._terms.copy())
diff --git a/nipy/algorithms/statistics/rft.py b/nipy/algorithms/statistics/rft.py
@@ -343,7 +343,7 @@ def __repr__(self):
             m = repr(self.m)
         else:
             m = f'{self.m:f}'
-        return f"ECquasi({repr(self.coeffs)}, m={m}, exponent={self.exponent:f})"
+        return f"ECquasi({self.coeffs!r}, m={m}, exponent={self.exponent:f})"
 
     __str__ = __repr__
     __rsub__ = __sub__
diff --git a/nipy/algorithms/statistics/tests/test_intrinsic_volumes.py b/nipy/algorithms/statistics/tests/test_intrinsic_volumes.py
@@ -1,7 +1,7 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 
-from itertools import combinations
+from itertools import chain, combinations
 
 import numpy as np
 import numpy.linalg as npl
@@ -192,7 +192,7 @@ def test_ec():
         assert_almost_equal(f(box1), 1)
         # While we're here, test we can use different dtypes, and that values
         # other than 0 or 1 raise an error.
-        for dtt in sum([SCTYPES[t] for t in ('int', 'uint', 'float')], []):
+        for dtt in chain.from_iterable(SCTYPES[t] for t in ('int', 'uint', 'float')):
             box1_again = box1.copy().astype(dtt)
             assert_almost_equal(f(box1_again), 1)
             box1_again[(10,) * i] = 2
diff --git a/nipy/algorithms/statistics/tests/test_quantile.py b/nipy/algorithms/statistics/tests/test_quantile.py
@@ -1,6 +1,8 @@
 """ Test quartile functions
 """
 
+from itertools import chain
+
 import numpy as np
 from numpy import median as np_median
 from numpy.testing import assert_array_almost_equal, assert_array_equal
@@ -10,9 +12,11 @@
 
 from .._quantile import _median, _quantile
 
-NUMERIC_TYPES = sum([SCTYPES[t]
-                     for t in ('int', 'uint', 'float', 'complex')],
-                    [])
+NUMERIC_TYPES = list(
+    chain.from_iterable(
+        SCTYPES[t] for t in ("int", "uint", "float", "complex")
+    )
+)
 
 
 def another_percentile(arr, pct, axis):
diff --git a/nipy/core/reference/array_coords.py b/nipy/core/reference/array_coords.py
@@ -188,7 +188,7 @@ def from_shape(coordmap, shape):
 
     def __repr__(self):
         return "ArrayCoordMap(\n  coordmap=" + \
-            '\n  '.join(repr(self.coordmap).split('\n')) + f',\n  shape={repr(self.shape)}' + '\n)'
+            '\n  '.join(repr(self.coordmap).split('\n')) + f',\n  shape={self.shape!r}' + '\n)'
 
 
 def _slice(coordmap, shape, *slices):
diff --git a/nipy/core/reference/coordinate_map.py b/nipy/core/reference/coordinate_map.py
@@ -423,9 +423,9 @@ def __copy__(self):
 
     def __repr__(self):
         if self.inverse_function is None:
-            return f"CoordinateMap(\n   function_domain={self.function_domain},\n   function_range={self.function_range},\n   function={repr(self.function)}\n  )"
+            return f"CoordinateMap(\n   function_domain={self.function_domain},\n   function_range={self.function_range},\n   function={self.function!r}\n  )"
         else:
-            return f"CoordinateMap(\n   function_domain={self.function_domain},\n   function_range={self.function_range},\n   function={repr(self.function)},\n   inverse_function={repr(self.inverse_function)}\n  )"
+            return f"CoordinateMap(\n   function_domain={self.function_domain},\n   function_range={self.function_range},\n   function={self.function!r},\n   inverse_function={self.inverse_function!r}\n  )"
 
 
     def _checkfunction(self):
@@ -1370,7 +1370,7 @@ def renamed_domain(mapping, newnames, name=''):
 
     for key in list(newnames):
         if key not in mapping.function_domain.coord_names:
-            raise ValueError(f'no domain coordinate named {str(key)}')
+            raise ValueError(f'no domain coordinate named {key}')
 
     new_coord_names = []
     for n in mapping.function_domain.coord_names:
@@ -1434,7 +1434,7 @@ def renamed_range(mapping, newnames):
 
     for key in list(newnames):
         if key not in mapping.function_range.coord_names:
-            raise ValueError(f'no range coordinate named {str(key)}')
+            raise ValueError(f'no range coordinate named {key}')
 
     new_coord_names = []
     for n in mapping.function_range.coord_names:
diff --git a/nipy/modalities/fmri/fmristat/hrf.py b/nipy/modalities/fmri/fmristat/hrf.py
@@ -188,7 +188,7 @@ def approx(time, delta):
      approx.dinverse,
      approx.forward,
      approx.dforward) = invertR(delta, approx.coef)
-    dhrf = implemented_function(f'd{str(hrf2decompose)}', dhrft)
+    dhrf = implemented_function(f'd{hrf2decompose}', dhrft)
     return [hrf2decompose, dhrf], approx
 
 
diff --git a/nipy/utils/perlpie.py b/nipy/utils/perlpie.py
@@ -96,7 +96,7 @@ def perl_dash_pie(oldstr, newstr, dry_run=None):
         Error while executing perl_dash_pie command:
         {cmd}
         Error:
-        {str(err)}
+        {err}
         """
         raise Exception(msg)
 
diff --git a/nipy/utils/tests/test_arrays.py b/nipy/utils/tests/test_arrays.py
@@ -1,6 +1,8 @@
 """ Testing arrays module
 """
 
+from itertools import chain
+
 import numpy as np
 import pytest
 from numpy.testing import assert_array_almost_equal, assert_array_equal
@@ -13,7 +15,7 @@
 def test_strides_from():
     for shape in ((3,), (2,3), (2,3,4), (5,4,3,2)):
         for order in 'FC':
-            for dtype in sum(SCTYPES.values(), []):
+            for dtype in chain.from_iterable(SCTYPES.values()):
                 if dtype is bytes:
                     dtype = 'S3'
                 elif dtype is str:
