From c3c3452e42de2497ce954127f6444c6e5cbb79f7 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:08:17 +0200 Subject: [PATCH 1/2] Apply ruff/refurb preview rule FURB145 FURB145 Prefer `copy` method over slicing --- nipy/algorithms/utils/tests/test_pca_image.py | 4 ++-- nipy/core/utils/generators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nipy/algorithms/utils/tests/test_pca_image.py b/nipy/algorithms/utils/tests/test_pca_image.py index 33519f129..350ba8b99 100644 --- a/nipy/algorithms/utils/tests/test_pca_image.py +++ b/nipy/algorithms/utils/tests/test_pca_image.py @@ -302,7 +302,7 @@ def test_other_axes(data_dict): assert_almost_equal(pos_dp['basis_vectors'], pos_p[bv_key]) assert_almost_equal(pos_dp['basis_projections'], img_bps.get_fdata()) # And we've replaced the expected axis - exp_coords = in_coords[:] + exp_coords = in_coords.copy() exp_coords[exp_coords.index(axis_name)] = 'PCA components' assert img_bps.axes.coord_names == tuple(exp_coords) # If the affine is not diagonal, we'll get an error @@ -323,6 +323,6 @@ def test_other_axes(data_dict): pytest.raises(AxisError, pca_image, nd_img, axis_name) for axis_name in 'kt': p = pca_image(img, axis_name, ncomp=ncomp) - exp_coords = in_coords[:] + exp_coords = in_coords.copy() exp_coords[exp_coords.index(axis_name)] = 'PCA components' assert p['basis_projections'].axes.coord_names == tuple(exp_coords) diff --git a/nipy/core/utils/generators.py b/nipy/core/utils/generators.py index f74aabf7b..1bdaf86de 100644 --- a/nipy/core/utils/generators.py +++ b/nipy/core/utils/generators.py @@ -182,7 +182,7 @@ def slice_generator(data, axis=0): slice_template = [slice(0, s) for s in data.shape] for n in range(nmax): - slices = slice_template[:] + slices = slice_template.copy() for (a, div, mod) in zip(axis, divs, mods): x = int(n / div % mod) slices[a] = x From 888317e9391ea4715be72f17b623a6f135fbb1b0 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:09:16 +0200 Subject: [PATCH 2/2] Apply ruff/refurb preview rule FURB148 FURB148 `enumerate` index is unused, use `for x in y` instead --- nipy/algorithms/utils/pca.py | 2 +- nipy/labs/mask.py | 2 +- nipy/modalities/fmri/tests/test_glm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nipy/algorithms/utils/pca.py b/nipy/algorithms/utils/pca.py index 07a7a7337..9e52304c3 100644 --- a/nipy/algorithms/utils/pca.py +++ b/nipy/algorithms/utils/pca.py @@ -216,7 +216,7 @@ def _get_covariance(data, UX, rmse_scales_func, mask): # If we have more then 2D, then we iterate over slices in the second # dimension, in order to save memory slices = [slice(i,i+1) for i in range(data.shape[1])] - for i, s_slice in enumerate(slices): + for s_slice in slices: Y = data[:,s_slice].reshape((n_pts, -1)) # project data into required space YX = np.dot(UX, Y) diff --git a/nipy/labs/mask.py b/nipy/labs/mask.py index 6ac955e72..5e1db8ec5 100644 --- a/nipy/labs/mask.py +++ b/nipy/labs/mask.py @@ -293,7 +293,7 @@ def compute_mask_sessions(session_images, m=0.2, M=0.9, cc=1, threshold=0.5, The mean image """ mask, mean = None, None - for index, session in enumerate(session_images): + for session in session_images: if hasattr(session, 'get_fdata'): mean = session.get_fdata() if mean.ndim > 3: diff --git a/nipy/modalities/fmri/tests/test_glm.py b/nipy/modalities/fmri/tests/test_glm.py index 058c49067..5c52d9df6 100644 --- a/nipy/modalities/fmri/tests/test_glm.py +++ b/nipy/modalities/fmri/tests/test_glm.py @@ -37,7 +37,7 @@ def write_fake_fmri_data(shapes, rk=3, affine=np.eye(4)): def generate_fake_fmri_data(shapes, rk=3, affine=np.eye(4)): fmri_data = [] design_matrices = [] - for i, shape in enumerate(shapes): + for shape in shapes: data = 100 + np.random.randn(*shape) data[0] -= 10 fmri_data.append(Nifti1Image(data, affine))