Merge pull request #1405 from effigies/chore/ruff

chore: Update ruff, address complaints

Author: effigies

.git-blame-ignore-revs

@@ -1,3 +1,7 @@
+# Sun Jan 12 12:22:13 2025 -0500 - [email protected] - sty: ruff format [git-blame-ignore-rev]
+40e41208a0f04063b3c4e373a65da1a2a6a275b5
+# Sun Jan 12 11:51:49 2025 -0500 - [email protected] - STY: ruff format [git-blame-ignore-rev]
+7e5d584910c67851dcfcd074ff307122689b61f5
 # Sun Jan 1 12:38:02 2023 -0500 - [email protected] - STY: Run pre-commit config on all files
 d14c1cf282a9c3b19189f490f10c35f5739e24d1
 # Thu Dec 29 22:53:17 2022 -0500 - [email protected] - STY: Reduce array().astype() and similar constructs

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ".*/data/.*"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -13,7 +13,7 @@ repos:
       - id: check-merge-conflict
       - id: check-vcs-permalinks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.4
+    rev: v0.9.1
     hooks:
       - id: ruff
         args: [ --fix ]
@@ -24,7 +24,7 @@ repos:
         args: [ --select, ISC001, --fix ]
         exclude: = ["doc", "tools"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.2
+    rev: v1.14.1
     hooks:
       - id: mypy
         # Sync with project.optional-dependencies.typing

bin/parrec2nii

@@ -1,6 +1,5 @@
 #!python
-"""PAR/REC to NIfTI converter
-"""
+"""PAR/REC to NIfTI converter"""
 
 from nibabel.cmdline.parrec2nii import main
 

nibabel/benchmarks/bench_array_to_file.py

@@ -29,24 +29,25 @@ def bench_array_to_file():
     sys.stdout.flush()
     print_git_title('\nArray to file')
     mtime = measure('array_to_file(arr, BytesIO(), np.float32)', repeat)
-    print('%30s %6.2f' % ('Save float64 to float32', mtime))
+    fmt = '{:30s} {:6.2f}'.format
+    print(fmt('Save float64 to float32', mtime))
     mtime = measure('array_to_file(arr, BytesIO(), np.int16)', repeat)
-    print('%30s %6.2f' % ('Save float64 to int16', mtime))
+    print(fmt('Save float64 to int16', mtime))
     # Set a lot of NaNs to check timing
     arr[:, :, :, 1] = np.nan
     mtime = measure('array_to_file(arr, BytesIO(), np.float32)', repeat)
-    print('%30s %6.2f' % ('Save float64 to float32, NaNs', mtime))
+    print(fmt('Save float64 to float32, NaNs', mtime))
     mtime = measure('array_to_file(arr, BytesIO(), np.int16)', repeat)
-    print('%30s %6.2f' % ('Save float64 to int16, NaNs', mtime))
+    print(fmt('Save float64 to int16, NaNs', mtime))
     # Set a lot of infs to check timing
     arr[:, :, :, 1] = np.inf
     mtime = measure('array_to_file(arr, BytesIO(), np.float32)', repeat)
-    print('%30s %6.2f' % ('Save float64 to float32, infs', mtime))
+    print(fmt('Save float64 to float32, infs', mtime))
     mtime = measure('array_to_file(arr, BytesIO(), np.int16)', repeat)
-    print('%30s %6.2f' % ('Save float64 to int16, infs', mtime))
+    print(fmt('Save float64 to int16, infs', mtime))
     # Int16 input, float output
     arr = np.random.random_integers(low=-1000, high=1000, size=img_shape)
     arr = arr.astype(np.int16)
     mtime = measure('array_to_file(arr, BytesIO(), np.float32)', repeat)
-    print('%30s %6.2f' % ('Save Int16 to float32', mtime))
+    print(fmt('Save Int16 to float32', mtime))
     sys.stdout.flush()

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -96,7 +96,7 @@ def fmt_sliceobj(sliceobj):
                 slcstr.append(s)
             else:
                 slcstr.append(str(int(s * SHAPE[i])))
-        return f"[{', '.join(slcstr)}]"
+        return f'[{", ".join(slcstr)}]'
 
     with InTemporaryDirectory():
         print(f'Generating test data... ({int(round(np.prod(SHAPE) * 4 / 1048576.0))} MB)')

nibabel/benchmarks/bench_finite_range.py

@@ -28,16 +28,17 @@ def bench_finite_range():
     sys.stdout.flush()
     print_git_title('\nFinite range')
     mtime = measure('finite_range(arr)', repeat)
-    print('%30s %6.2f' % ('float64 all finite', mtime))
+    fmt = '{:30s} {:6.2f}'.format
+    print(fmt('float64 all finite', mtime))
     arr[:, :, :, 1] = np.nan
     mtime = measure('finite_range(arr)', repeat)
-    print('%30s %6.2f' % ('float64 many NaNs', mtime))
+    print(fmt('float64 many NaNs', mtime))
     arr[:, :, :, 1] = np.inf
     mtime = measure('finite_range(arr)', repeat)
-    print('%30s %6.2f' % ('float64 many infs', mtime))
+    print(fmt('float64 many infs', mtime))
     # Int16 input, float output
     arr = np.random.random_integers(low=-1000, high=1000, size=img_shape)
     arr = arr.astype(np.int16)
     mtime = measure('finite_range(arr)', repeat)
-    print('%30s %6.2f' % ('int16', mtime))
+    print(fmt('int16', mtime))
     sys.stdout.flush()

nibabel/benchmarks/bench_load_save.py

@@ -34,20 +34,21 @@ def bench_load_save():
     print_git_title('Image load save')
     hdr.set_data_dtype(np.float32)
     mtime = measure('sio.truncate(0); img.to_file_map()', repeat)
-    print('%30s %6.2f' % ('Save float64 to float32', mtime))
+    fmt = '{:30s} {:6.2f}'.format
+    print(fmt('Save float64 to float32', mtime))
     mtime = measure('img.from_file_map(img.file_map)', repeat)
-    print('%30s %6.2f' % ('Load from float32', mtime))
+    print(fmt('Load from float32', mtime))
     hdr.set_data_dtype(np.int16)
     mtime = measure('sio.truncate(0); img.to_file_map()', repeat)
-    print('%30s %6.2f' % ('Save float64 to int16', mtime))
+    print(fmt('Save float64 to int16', mtime))
     mtime = measure('img.from_file_map(img.file_map)', repeat)
-    print('%30s %6.2f' % ('Load from int16', mtime))
+    print(fmt('Load from int16', mtime))
     # Set a lot of NaNs to check timing
     arr[:, :, :20] = np.nan
     mtime = measure('sio.truncate(0); img.to_file_map()', repeat)
-    print('%30s %6.2f' % ('Save float64 to int16, NaNs', mtime))
+    print(fmt('Save float64 to int16, NaNs', mtime))
     mtime = measure('img.from_file_map(img.file_map)', repeat)
-    print('%30s %6.2f' % ('Load from int16, NaNs', mtime))
+    print(fmt('Load from int16, NaNs', mtime))
     # Int16 input, float output
     arr = np.random.random_integers(low=-1000, high=1000, size=img_shape)
     arr = arr.astype(np.int16)
@@ -57,5 +58,5 @@ def bench_load_save():
     hdr = img.header
     hdr.set_data_dtype(np.float32)
     mtime = measure('sio.truncate(0); img.to_file_map()', repeat)
-    print('%30s %6.2f' % ('Save Int16 to float32', mtime))
+    print(fmt('Save Int16 to float32', mtime))
     sys.stdout.flush()

nibabel/benchmarks/butils.py

@@ -5,6 +5,6 @@
 
 def print_git_title(title):
     """Prints title string with git hash if possible, and underline"""
-    title = f"{title} for git revision {get_info()['commit_hash']}"
+    title = f'{title} for git revision {get_info()["commit_hash"]}'
     print(title)
     print('-' * len(title))

nibabel/brikhead.py

@@ -555,7 +555,7 @@ def filespec_to_file_map(klass, filespec):
             fname = fholder.filename
             if key == 'header' and not os.path.exists(fname):
                 for ext in klass._compressed_suffixes:
-                    fname = fname[: -len(ext)] if fname.endswith(ext) else fname
+                    fname = fname.removesuffix(ext)
             elif key == 'image' and not os.path.exists(fname):
                 for ext in klass._compressed_suffixes:
                     if os.path.exists(fname + ext):

nibabel/cifti2/cifti2.py

@@ -294,8 +294,7 @@ def __setitem__(self, key, value):
             self._labels[key] = Cifti2Label(*([key] + list(value)))
         except ValueError:
             raise ValueError(
-                'Key should be int, value should be sequence '
-                'of str and 4 floats between 0 and 1'
+                'Key should be int, value should be sequence of str and 4 floats between 0 and 1'
             )
 
     def __delitem__(self, key):